Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -27,8 +27,8 @@ public interface JgMaintainNoticeMapper extends CustomBaseMapper<JgMaintainNotic
     Page<JgMaintainNotice> queryForPage(Page<JgMaintainNotice> page,
                                         @Param("param") JgMaintainNoticeDto model,
                                         @Param("type") String type,
-                                        @Param("userId") String userId,
-                                        @Param("orgCode") String orgCode);
+                                        @Param("orgCode") String orgCode,
+                                        @Param("userId") String userId);
 
     /**
      * 根据维修告知编号查询设备、设计、制造等信息

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

@@ -18,7 +18,6 @@
         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}, '%')
@@ -49,6 +48,7 @@
             <if test="type == 'company'">
                 AND isn.install_unit_credit_code = #{orgCode}
             </if>
+            or isn.transfer_to_user_ids like concat('%',#{userId},'%')
         </where>
         ORDER BY
         isn.apply_no DESC

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

@@ -657,7 +657,7 @@ public class CommonServiceImpl implements ICommonService {
         cmWorkflowService.assign(flowTaskVo);
         //修改待办
         List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(instanceId).getResult();
-        TaskV2Model taskV2Model = result.stream().filter(r -> r.getFlowCode().equals(taskId)).findFirst().orElse(null);
+        TaskV2Model taskV2Model = result.stream().filter(r -> r.getFlowCode()!= null && r.getFlowCode().equals(taskId)).findFirst().orElse(null);
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         taskV2Model.setExecuteUserIds(reginParams.getUserModel().getUserId());
         taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_TRANSFER.getCode());
@@ -680,12 +680,7 @@ public class CommonServiceImpl implements ICommonService {
         Systemctl.taskV2Client.create(taskV2Model);
 
         String id = commonMapper.selectBusinessData(tableName, instanceId);
-        if ("null".equals(id)) {
-            id = assignee;
-        } else {
-            id = id + "," + assignee;
-        }
-
+        id = ObjectUtils.isEmpty(id) ? assignee : id + "," + assignee;
         //修改业务数据
         commonMapper.updateBusinessData(tableName, assignee, id, instanceId);
         return Boolean.TRUE;

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

@@ -323,6 +323,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
                 TaskModelDto taskModelDto = new TaskModelDto();
                 BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                taskModelDto.setFlowCode(jgChangeRegistrationReform.getNextTaskId());
                 taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
                 taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
@@ -851,6 +852,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             taskModelDto.setStartUserCompanyName(jgChangeRegistrationReform.getCreateUserCompanyName());
             //任务发起人发起时间
             taskModelDto.setStartDate(new Date());
+            taskModelDto.setFlowCode(jgChangeRegistrationReform.getNextTaskId());
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
             //跳转路径
 //        taskModelDto.setRoutePath();

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

@@ -361,6 +361,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             dto.setTaskCode(oldTransfer.getApplyNo());
             dto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
             dto.setRelationId(oldTransfer.getSequenceNbr() + "");
+            dto.setFlowCode(oldTransfer.getNextTaskId());
             modelDtos.add(dto);
             commonService.buildTaskModel(modelDtos);
         }
@@ -699,6 +700,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                     taskModelDto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
                     taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName());
                     taskModelDto.setRelationId(instanceId);
+                    taskModelDto.setFlowCode(jgChangeRegistrationTransfer.getNextTaskId());
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgChangeRegistrationTransfer, taskMessageDto);
                     taskModelDto.setPageType(this.getPageTypeByCurrentNode(jgChangeRegistrationTransfer.getAuditStatus()));

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

@@ -444,6 +444,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         taskV2Model.setStartUserId(jgScrapCancelDto.getCreateUserId());
         taskV2Model.setStartUserCompanyName(jgScrapCancelDto.getUseUnitName());
         taskV2Model.setExecuteUserIds(nextUserIds);
+        taskV2Model.setFlowCode(jgScrapCancelDto.getNextTaskId());
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model, modelDto);
         modelDto.setNextExecuteUser(jgScrapCancelDto.getNextExecuteIds());

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

@@ -467,6 +467,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
         dto.setTaskContent("来自" + this.getBaseMapper().getEquType(jgUseRegistrationEq.getEquId()) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
+        dto.setFlowCode(jgUseRegistration.getNextTaskId());
         list.add(dto);
         commonServiceImpl.buildTaskModel(list);
     }