维修告知列表添加筛选条件

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgMaintainNotice.java

@@ -323,6 +323,9 @@ public class JgMaintainNotice extends BaseEntity {
     @TableField(value = "create_user_company_name")
     private String createUserCompanyName;
 
+    @TableField(value = "transfer_to_user_ids")
+    private String transferToUserIds;
+
 
     @TableField("next_task_id")
     private String nextTaskId;

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

@@ -24,7 +24,11 @@ public interface JgMaintainNoticeMapper extends CustomBaseMapper<JgMaintainNotic
      * @param type  类型：enterprise-企业端、supervision-监管端
      * @return 维修告知列表
      */
-    Page<JgMaintainNotice> queryForPage(Page<JgMaintainNotice> page, @Param("param") JgMaintainNoticeDto model, @Param("type") String type, @Param("orgCode") String orgCode);
+    Page<JgMaintainNotice> queryForPage(Page<JgMaintainNotice> page,
+                                        @Param("param") JgMaintainNoticeDto model,
+                                        @Param("type") String type,
+                                        @Param("userId") String userId,
+                                        @Param("orgCode") String orgCode);
 
     /**
      * 根据维修告知编号查询设备、设计、制造等信息

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

@@ -18,6 +18,7 @@
         LEFT JOIN idx_biz_jg_other_info ibjoi on isneq.equ_id = ibjoi.RECORD
         <where>
             isn.is_delete = 0
+            and isn.transfer_to_user_ids like concat('%',#{userId},'%'))
             <if test="param != null ">
                 <if test="param.applyNo != null and param.applyNo != ''">
                     AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')

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/JgMaintainNoticeServiceImpl.java

@@ -280,8 +280,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     public Page<JgMaintainNoticeDto> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, JgMaintainNoticeDto model, ReginParams reginParams) {
         String orgCode = reginParams.getCompany().getCompanyCode();
         String type = reginParams.getCompany().getLevel();
+        String userId = reginParams.getUserModel().getUserId();
         List<DataDictionary> dictionaries = dataDictionaryService.getByType("WXLX");
-        Page<JgMaintainNotice> noticePage = jgMaintainNoticeMapper.queryForPage(page, model, type, orgCode);
+        Page<JgMaintainNotice> noticePage = jgMaintainNoticeMapper.queryForPage(page, model, type, orgCode,userId);
         Page<JgMaintainNoticeDto> noticeDtoPage = new Page<>();
         BeanUtils.copyProperties(noticePage, noticeDtoPage, "records");
         List<JgMaintainNoticeDto> records = noticePage.getRecords().stream().map(notice -> {
@@ -505,6 +506,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             //行数据
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(obj, taskMessageDto);
+            taskMessageDto.setNextTaskId(obj.getNextTaskId());
             dto.setModel(taskMessageDto);
             //摘要 按原有规则组装
             dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), obj.getSupervisoryCode(), obj.getApplyNo()));
@@ -532,7 +534,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDto.setTaskCode(item.getApplyNo());
             taskModelDto.setTaskType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getCode());
             taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName());
-            taskModelDto.setRelationId(workflowResultDto.getInstanceId());
+            String instanceId = workflowResultList.stream().filter(e -> e.getInstanceId().equals(item.getInstanceId())).findFirst().orElse(null).getInstanceId();
+            taskModelDto.setRelationId(instanceId);
             taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds()); // 工作流API返回
             taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
             taskModelDto.setFlowStatus(commonService.getDictionaryCodeByName(FlowStatusEnum.TO_BE_PROCESSED.getName())); // 流程状态枚举
@@ -544,6 +547,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDto.setStartDate(item.getCreateDate());
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(item, taskMessageDto);
+            taskMessageDto.setNextTaskId(item.getNextTaskId());
             taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
             taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()));