Browse Source

优化业务工单多人执行跨部门逻辑
优化当前处理部门相关sql

linzhiwei 2 years ago
parent
commit
af61b53715

+ 1 - 1
hnls-mis/hnls-mis-boot/src/main/java/com/tofly/xrtymis/custom/service/impl/GdglinfoServiceImpl.java

@@ -1011,7 +1011,7 @@ public class GdglinfoServiceImpl extends ServiceImpl<GdglinfoMapper, Gdglinfo> i
         if (GdglinfoEM.ISENABLE.getType().equals(gdflowconfig.getRzczSfqy())) {
             Gdperson gdperson = gdpersonService.getGdperson(gdlcid, 2);
             gdinfo.setSlry(String.valueOf(gdperson.getPersonId()));
-            gdinfo.setSlbm(gdperson.getDepartId());
+            gdinfo.setSlbm(String.valueOf(gdperson.getDepartId()));
         } else if (GdglinfoEM.ISENABLE.getType().equals(gdflowconfig.getRzshSfqy())) {
             Gdperson gdperson = gdpersonService.getGdperson(gdlcid, 3);
             gdinfo.setRzslry(gdperson.getPersonId());

+ 1 - 1
hnls-mis/hnls-mis-boot/src/main/java/com/tofly/xrtymis/custom/vo/CurrentNodeInformationVo.java

@@ -34,7 +34,7 @@ public class CurrentNodeInformationVo extends Model<CurrentNodeInformationVo> {
     private String presentPersonName;
 
     @ApiModelProperty(value = "当前处理部门")
-    private Long presentDept;
+    private String presentDept;
 
     @TableField(exist = false)
     private String presentDeptName;

+ 1 - 1
hnls-mis/hnls-mis-boot/src/main/java/com/tofly/xrtymis/entity/Gdglinfo.java

@@ -130,7 +130,7 @@ public class Gdglinfo extends Model<Gdglinfo> {
      * 处理部门-工单登记
      */
     @ApiModelProperty(value = "处理部门-工单登记")
-    private Long slbm;
+    private String slbm;
     @TableField(exist = false)
     @ApiModelProperty(value = "处理部门数字转化-工单登记", hidden = true)
     private String slbmName;

+ 7 - 4
hnls-mis/hnls-mis-boot/src/main/resources/mapper/GdglinfoMapper.xml

@@ -235,8 +235,8 @@
     <select id="getPresentInfo" resultType="com.tofly.xrtymis.custom.vo.CurrentNodeInformationVo">
         SELECT m.presentPerson as presentPerson,
                (SELECT wm_concat(REAL_NAME) FROM TF_SMPN_USER_X WHERE  instr(m.presentPerson, id) > 0) as presentPersonName,
-               (SELECT distinct (DEPARTMENT_ID) FROM TF_SMPN_USER_X WHERE  instr(m.presentPerson, id) > 0) as presentDept,
-               (SELECT NAME FROM TF_SMPN_DEPARTMENT_X where id =
+               (SELECT wm_concat(distinct(DEPARTMENT_ID)) FROM TF_SMPN_USER_X WHERE  instr(m.presentPerson, id) > 0) as presentDept,
+               (SELECT wm_concat(NAME) FROM TF_SMPN_DEPARTMENT_X where id in
                (SELECT distinct (DEPARTMENT_ID) FROM TF_SMPN_USER_X WHERE  instr(m.presentPerson, id) > 0)) as presentDeptName
         FROM (SELECT id,
                      CASE LCJD
@@ -374,9 +374,12 @@
         WHERE ID = #{gdlx}
     </select>
     <select id="slbmName" resultType="string">
-        select NAME
+        select wm_concat(NAME)
         FROM "TF_SMPN_DEPARTMENT_X"
-        WHERE ID = #{slbm}
+        WHERE ID in
+        <foreach collection="slbm.split(',')" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </select>
     <select id="shbmName" resultType="string">
         select NAME