diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 8165de28..67473587 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -79,6 +79,7 @@ CREATE TABLE JCL_ORG_POST_INFO ( post_info_qualification text null, post_id int null, description text NULL, + forbidden_tag int NULL, creator int null, delete_type int null, create_time date null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 863e56b9..4f6f4b75 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -81,6 +81,7 @@ CREATE TABLE JCL_ORG_POST_INFO ( POST_INFO_QUALIFICATION NVARCHAR2(1000) NULL, POST_ID NUMBER NULL, DESCRIPTION NVARCHAR2(1000) NULL, + FORBIDDEN_TAG NUMBER NULL, CREATOR NUMBER NULL, DELETE_TYPE NUMBER NULL, CREATE_TIME DATE NULL, diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index 47722348..a07f5514 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -79,6 +79,7 @@ CREATE TABLE JCL_ORG_POST_INFO ( post_info_qualification text null, post_id int null, description text COLLATE Chinese_PRC_CI_AS NULL, + forbidden_tag int NULL, creator int null, delete_type int null, create_time date null, diff --git a/src/com/engine/organization/entity/comp/po/CompPO.java b/src/com/engine/organization/entity/comp/po/CompPO.java new file mode 100644 index 00000000..c76234fa --- /dev/null +++ b/src/com/engine/organization/entity/comp/po/CompPO.java @@ -0,0 +1,35 @@ +package com.engine.organization.entity.comp.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/16 + * @version: 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CompPO { + private Long id; + private String compNo; + private String compName; + private String compNameShort; + private Long parentCompany; + private String orgCode; + private Integer industry; + private Integer compPrincipal; + private String description; + private String forbiddenTag; + private Long creator; + private int deleteType; + private Date createTime; + private Date updateTime; +} diff --git a/src/com/engine/organization/entity/post/dto/PostInfoDTO.java b/src/com/engine/organization/entity/post/dto/PostInfoDTO.java index 1c04fbe7..47bcde77 100644 --- a/src/com/engine/organization/entity/post/dto/PostInfoDTO.java +++ b/src/com/engine/organization/entity/post/dto/PostInfoDTO.java @@ -25,6 +25,7 @@ public class PostInfoDTO { .postInfoQualification(param.getPostInfoQualification() == null ? null : param.getPostInfoQualification()) .postId(param.getPostId() == null ? null : param.getPostId()) .description(param.getDescription() == null ? null : param.getDescription()) + .forbiddenTag(param.getForbiddenTag() == null ? 0 : param.getForbiddenTag() ? 0 : 1) .deleteType(0) .createTime(new Date()) .updateTime(new Date()) diff --git a/src/com/engine/organization/entity/post/param/PostInfoSearchParam.java b/src/com/engine/organization/entity/post/param/PostInfoSearchParam.java index a0f6eac2..1a5bca15 100644 --- a/src/com/engine/organization/entity/post/param/PostInfoSearchParam.java +++ b/src/com/engine/organization/entity/post/param/PostInfoSearchParam.java @@ -48,4 +48,8 @@ public class PostInfoSearchParam { * 说明 */ private String description; + /** + * 禁用标记 + */ + private Boolean forbiddenTag; } diff --git a/src/com/engine/organization/entity/post/po/PostInfoPO.java b/src/com/engine/organization/entity/post/po/PostInfoPO.java index 84f5425f..baf8c7d8 100644 --- a/src/com/engine/organization/entity/post/po/PostInfoPO.java +++ b/src/com/engine/organization/entity/post/po/PostInfoPO.java @@ -51,6 +51,11 @@ public class PostInfoPO { */ private String description; + /** + * 禁用标记 + */ + private Integer forbiddenTag; + private Long creator; private int deleteType; private Date createTime; diff --git a/src/com/engine/organization/entity/post/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/post/vo/PostInfoTableVO.java index 3014f36f..3bbc6ef7 100644 --- a/src/com/engine/organization/entity/post/vo/PostInfoTableVO.java +++ b/src/com/engine/organization/entity/post/vo/PostInfoTableVO.java @@ -26,7 +26,8 @@ import lombok.NoArgsConstructor; " t.post_info_duty," + " t.post_info_qualification," + " a.post_name," + - " t.description", + " t.description," + + " t.forbidden_tag", fromSql = " from jcl_org_post_info t inner join jcl_org_post a on t.post_id = a.id ", orderby = "id desc", primarykey = "id", @@ -36,44 +37,50 @@ import lombok.NoArgsConstructor; } ) public class PostInfoTableVO { - /** - * 主键 - */ - @OrganizationTableColumn(column = "id", display = false) - private Long id; - /** - * 编号 - */ - @OrganizationTableColumn(text = "编号", width = "20%", column = "post_info_no") - private String postInfoNo; - /** - * 名称 - */ - @OrganizationTableColumn(text = "名称", width = "20%", column = "post_info_name") - private String postInfoName; - /** - * 权限 - */ - @OrganizationTableColumn(text = "权限", width = "20%", column = "post_info_authority") - private String postInfoAuthority; - /** - * 责任 - */ - @OrganizationTableColumn(text = "责任", width = "20%", column = "post_info_duty") - private String postInfoDuty; - /** - * 资格 - */ - @OrganizationTableColumn(text = "资格", width = "20%", column = "post_info_qualification") - private String postInfoQualification; - /** - * 职务分类 - */ - @OrganizationTableColumn(text = "职务分类", width = "20%", column = "post_name") - private Integer postName; - /** - * 说明 - */ - @OrganizationTableColumn(text = "说明", width = "20%", column = "description") - private String description; + /** + * 主键 + */ + @OrganizationTableColumn(column = "id", display = false) + private Long id; + /** + * 编号 + */ + @OrganizationTableColumn(text = "编号", width = "20%", column = "post_info_no") + private String postInfoNo; + /** + * 名称 + */ + @OrganizationTableColumn(text = "名称", width = "20%", column = "post_info_name") + private String postInfoName; + /** + * 权限 + */ + @OrganizationTableColumn(text = "权限", width = "20%", column = "post_info_authority") + private String postInfoAuthority; + /** + * 责任 + */ + @OrganizationTableColumn(text = "责任", width = "20%", column = "post_info_duty") + private String postInfoDuty; + /** + * 资格 + */ + @OrganizationTableColumn(text = "资格", width = "20%", column = "post_info_qualification") + private String postInfoQualification; + /** + * 职务分类 + */ + @OrganizationTableColumn(text = "职务分类", width = "20%", column = "post_name") + private Integer postName; + /** + * 说明 + */ + @OrganizationTableColumn(text = "说明", width = "20%", column = "description") + private String description; + + /** + * 禁用标记 + */ + @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + private Integer forbiddenTag; } diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.java b/src/com/engine/organization/mapper/post/PostInfoMapper.java index 10815a74..f2b2d0d2 100644 --- a/src/com/engine/organization/mapper/post/PostInfoMapper.java +++ b/src/com/engine/organization/mapper/post/PostInfoMapper.java @@ -55,7 +55,14 @@ public interface PostInfoMapper { * @return */ int updatePostInfo(PostInfoPO postInfoPO); - + + /** + * 更新禁用标记 + * + * @param postInfoPO + * @return + */ + int updateForbiddenTagById(PostInfoPO postInfoPO); /** * 批量删除职务信息方案 * diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.xml b/src/com/engine/organization/mapper/post/PostInfoMapper.xml index 1d919c2e..9b9e449c 100644 --- a/src/com/engine/organization/mapper/post/PostInfoMapper.xml +++ b/src/com/engine/organization/mapper/post/PostInfoMapper.xml @@ -10,6 +10,7 @@ + @@ -28,6 +29,7 @@ , t.post_info_qualification , t.post_id , t.description + , t.forbidden_tag , t.creator , t.delete_type , t.create_time @@ -112,7 +114,7 @@ description, - + forbidden_tag, @@ -148,10 +150,18 @@ #{description}, - + 0, + + update jcl_org_sequence + + forbidden_tag=#{forbiddenTag}, + + WHERE id = #{id} AND delete_type = 0 + + UPDATE jcl_org_post_info SET delete_type = 1 diff --git a/src/com/engine/organization/service/PostInfoService.java b/src/com/engine/organization/service/PostInfoService.java index 7211fbcb..edeb6560 100644 --- a/src/com/engine/organization/service/PostInfoService.java +++ b/src/com/engine/organization/service/PostInfoService.java @@ -35,6 +35,13 @@ public interface PostInfoService { */ int updatePostInfo(PostInfoSearchParam param); + /** + * 更新禁用标记 + * + * @param params + */ + int updateForbiddenTagById(PostInfoSearchParam params); + /** * 根据ID批量删除 diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 727b7c8f..4e5e4eed 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -69,6 +69,12 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { return getPostInfoMapper().updatePostInfo(postInfoPO); } + @Override + public int updateForbiddenTagById(PostInfoSearchParam params) { + PostInfoPO postInfoPO = PostInfoPO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build(); + return getPostInfoMapper().updateForbiddenTagById(postInfoPO); + } + @Override public int deleteByIds(Collection ids) { diff --git a/src/com/engine/organization/web/PostInfoController.java b/src/com/engine/organization/web/PostInfoController.java index c5650e98..8fefbcb6 100644 --- a/src/com/engine/organization/web/PostInfoController.java +++ b/src/com/engine/organization/web/PostInfoController.java @@ -90,6 +90,26 @@ public class PostInfoController { } } + /** + * 更新禁用标记 + * + * @param request + * @param response + * @param param + * @return + */ + @POST + @Path("/updateForbiddenTagById") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostInfoSearchParam param) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getPostInfoWrapper(user).updateForbiddenTagById(param)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + /** * 根据ID批量删除数据 diff --git a/src/com/engine/organization/wrapper/PostInfoWrapper.java b/src/com/engine/organization/wrapper/PostInfoWrapper.java index 8b6288cc..8a7f4e25 100644 --- a/src/com/engine/organization/wrapper/PostInfoWrapper.java +++ b/src/com/engine/organization/wrapper/PostInfoWrapper.java @@ -52,6 +52,15 @@ public class PostInfoWrapper extends Service { return getPostInfoService(user).updatePostInfo(param); } + /** + * 更新禁用标记 + * + * @param params + */ + public int updateForbiddenTagById(PostInfoSearchParam params) { + return getPostInfoService(user).updateForbiddenTagById(params); + } + /** * 根据ID批量删除 *