启用停用列表修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgEnableDisableMapper.java

@@ -18,7 +18,8 @@ public interface JgEnableDisableMapper extends BaseMapper<JgEnableDisable> {
 
     Page<Map<String, Object>> pageList(@Param("page") Page<Map<String, Object>> page,
                                        @Param("dto") JgEnableDisableDto dto,
-                                       @Param("type") String type);
+                                       @Param("type") String type,
+                                       @Param("userId") String userId);
 
     Map<String, Object> getDetail(@Param("sequenceNbr") Long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.xml

@@ -26,6 +26,7 @@
                jed.promoter,
                jed.next_execute_user_ids as nextExecuteUserIds,
                jed.create_user_id as createUserId,
+               jed.next_task_id as nextTaskId,
                oi.SUPERVISORY_CODE as supervisoryCode
 
         FROM tzs_jg_enable_disable jed
@@ -34,6 +35,7 @@
                  LEFT JOIN idx_biz_jg_use_info use on jri.RECORD = use.RECORD
                  LEFT JOIN idx_biz_jg_other_info oi on jri.RECORD = oi.RECORD
         <where>
+            jed.is_delete = 0
             <if test="dto.applyNo != null and dto.applyNo != '' ">
               and  jed.apply_no like concat('%',#{dto.applyNo},'%')
             </if>
@@ -53,6 +55,7 @@
             <if test="dto.applyType != null and dto.applyType != ''">
                 and  jed.apply_type = #{dto.applyType}
             </if>
+            or jed.transfer_to_user_ids like concat('%',#{userId},'%')
         </where>
         order by jed.rec_date desc
     </select>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

@@ -232,8 +232,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         //摘要 按原有规则组装
         dto.setTaskContent(
                 String.format("来自%s【%s】的业务办理，【申请单号：%s】",
-                ObjectUtils.isEmpty(jgEnableDisable.getEquList()) ? "null" : jgEnableDisable.getEquList(),
-                ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "null" : jgEnableDisable.getSupervisoryCode(),
+                ObjectUtils.isEmpty(jgEnableDisable.getEquList()) ? "" : jgEnableDisable.getEquList(),
+                ObjectUtils.isEmpty(jgEnableDisable.getSupervisoryCode()) ? "" : jgEnableDisable.getSupervisoryCode(),
                 jgEnableDisable.getApplyNo()));
         //申请单号
         dto.setTaskCode(jgEnableDisable.getApplyNo());
@@ -334,7 +334,8 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             dto.setReceiveCompanyCode(reginParams.getCompany().getCompanyCode());
         }
         String level =  reginParams.getCompany().getLevel();
-        return this.baseMapper.pageList(page, dto, level);
+        String userId =  reginParams.getUserModel().getUserId();
+        return this.baseMapper.pageList(page, dto, level,userId);
     }