暂存bug修改

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

@@ -26,7 +26,8 @@
         isn.handle_date AS handleDate,
         isn.equ_list AS equList,
         isn.notice_report_url AS noticeReportUrl,
-        isn.create_user_id as createUserId
+        isn.create_user_id as createUserId,
+        isn.next_execute_user_ids as nextExecuteUserIds
         FROM
         tzs_jg_installation_notice isn
         <where>

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

@@ -25,7 +25,8 @@
         tjtn.notice_report_url AS noticeReportUrl,
         ec."name" AS equipCateName,
         tjtn.handle_date AS handleDate,
-        tjtn.create_user_id as createUserId
+        tjtn.create_user_id as createUserId,
+        tjtn.next_execute_user_ids as nextExecuteUserIds
         FROM
             tzs_jg_transfer_notice tjtn
             LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr

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

@@ -596,6 +596,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
+            } else {
+                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
@@ -753,6 +755,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
         jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
         jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
+        jsonObject.put("nextTaskId", jgInstallationNotice.getNextTaskId());
         commonService.rollbackTask(jgInstallationNotice.getInstanceId(), jsonObject);
     }
 

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

@@ -469,6 +469,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
                 dto.setPromoter(reginParams.getUserModel().getUserId());
                 dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
+            } else {
+                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
             }
             dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
             dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
@@ -650,6 +652,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
         jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
         jsonObject.put("flowStatus", FlowStatusEnum.ROLLBACK.getCode());
+        jsonObject.put("nextTaskId", jgInstallationNotice.getNextTaskId());
         commonService.rollbackTask(jgInstallationNotice.getInstanceId(), jsonObject);
     }