From 13b01c53cfe15ad5c35ac0a32cac59bfceb02343 Mon Sep 17 00:00:00 2001 From: mythxb Date: Fri, 28 Jul 2023 16:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=B3=A8=E5=86=8C=E5=92=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=B2=97=E4=BD=8D=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rzyc/enums/AuditStatusEnum.java | 4 +++ .../java/com/rzyc/enums/PositionTypeEnum.java | 27 +++++++++++++++++++ .../rzyc/mapper/user/ListPerformMapper.java | 7 +++++ .../mapper/ent/SysEnterpriseMapper.xml | 3 ++- .../mapper/user/ListPerformMapper.xml | 16 ++++++++++- .../src/main/resources/application.yml | 2 +- .../rzyc/controller/PcPersonalController.java | 12 +++++++++ 7 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 inventory-dao/src/main/java/com/rzyc/enums/PositionTypeEnum.java diff --git a/inventory-dao/src/main/java/com/rzyc/enums/AuditStatusEnum.java b/inventory-dao/src/main/java/com/rzyc/enums/AuditStatusEnum.java index 16ed438..0effd9a 100644 --- a/inventory-dao/src/main/java/com/rzyc/enums/AuditStatusEnum.java +++ b/inventory-dao/src/main/java/com/rzyc/enums/AuditStatusEnum.java @@ -1,5 +1,7 @@ package com.rzyc.enums; +import com.fasterxml.jackson.annotation.JsonFormat; + /** * @author dong * @date 2023-07-19 15:32 @@ -13,6 +15,8 @@ public enum AuditStatusEnum { private Integer state; + JsonFormat + AuditStatusEnum(Integer state) { this.state = state; } diff --git a/inventory-dao/src/main/java/com/rzyc/enums/PositionTypeEnum.java b/inventory-dao/src/main/java/com/rzyc/enums/PositionTypeEnum.java new file mode 100644 index 0000000..5620d19 --- /dev/null +++ b/inventory-dao/src/main/java/com/rzyc/enums/PositionTypeEnum.java @@ -0,0 +1,27 @@ +package com.rzyc.enums; + +/** + * 岗位类型 1、部门 2、岗位 + * @author dong + * @date 2023-07-20 9:25 + * @Version V1.0 + */ +public enum PositionTypeEnum { + + UNIT(1), + POST(2); + + private Integer type; + + PositionTypeEnum(Integer type) { + this.type = type; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java index c70aa2a..61f0c99 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/user/ListPerformMapper.java @@ -64,6 +64,9 @@ public interface ListPerformMapper extends BaseMapper { /*部门岗位*/ List unitPost(@Param("listPerformId") String listPerformId); + /*下级岗位数量*/ + Integer countPost(@Param("listPerformId") String listPerformId); + /*用户履职信息*/ UserDepart userPerform(@Param("listPerformId") String listPerformId); @@ -135,4 +138,8 @@ public interface ListPerformMapper extends BaseMapper { /*上级岗位*/ List topListperformList(@Param("listperformId") String listperformId); + /*修改岗位类型*/ + Integer changePositionType(@Param("listPerformId") String listPerformId, + @Param("positionType") Integer positionType); + } diff --git a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml index 1272eaf..abd0a73 100644 --- a/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml +++ b/inventory-dao/src/main/resources/mapper/ent/SysEnterpriseMapper.xml @@ -826,8 +826,9 @@ + + + - SELECT lp.* FROM ListPerform lp + SELECT lp.* + FROM ListPerform lp where 1 = 1 and FIND_IN_SET(#{superPerformId},lp.parent_path) @@ -893,4 +900,11 @@ WHERE FIND_IN_SET(#{listperformId},lf.`ViewJurisdiction`); + + + update listperform + set position_type = #{positionType} + where ListPerformId = #{listPerformId} + + diff --git a/inventory-ent/src/main/resources/application.yml b/inventory-ent/src/main/resources/application.yml index a26b1cf..e4120de 100644 --- a/inventory-ent/src/main/resources/application.yml +++ b/inventory-ent/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test #设定打包配置文件 + active: yun #设定打包配置文件 diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java index 74ad871..f443581 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java @@ -1710,6 +1710,13 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { ListPerform perform = listPerformMapper.selectByPrimaryKey(listPerform.getListperformid()); if(null != perform){ getPerformPath(listPerform.getSupclassid(),listPerform); + + Integer postNum = listPerformMapper.countPost(listPerform.getListperformid()); + if(postNum > 0){ + listPerform.setPositionType(PositionTypeEnum.UNIT.getType()); + } + + //修改 listPerformMapper.changeListPerform(listPerform); }else{ @@ -1721,9 +1728,14 @@ public class PcPersonalController extends com.rzyc.controller.BaseController { performClassCode = GetSysOrganCode(perform);//生成 } listPerform.setPerformclasscode(performClassCode); + listPerform.setPositionType(PositionTypeEnum.POST.getType()); getPerformPath(listPerform.getSupclassid(),listPerform); + //新增 listPerformMapper.insert(listPerform); + + //修改上级部门的部门类型 + listPerformMapper.changePositionType(listPerform.getSupclassid(),PositionTypeEnum.UNIT.getType()); } return result;