移装告知和安装告知代办问题 与列表按钮等问题修改

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

@@ -25,7 +25,8 @@
         isn.equ_address AS equAddress,
         isn.handle_date AS handleDate,
         isn.equ_list AS equList,
-        isn.notice_report_url AS noticeReportUrl
+        isn.notice_report_url AS noticeReportUrl,
+        isn.create_user_id as createUserId
         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

@@ -24,7 +24,8 @@
         tjtn.instance_status AS instanceStatus,
         tjtn.notice_report_url AS noticeReportUrl,
         ec."name" AS equipCateName,
-        tjtn.handle_date AS handleDate
+        tjtn.handle_date AS handleDate,
+        tjtn.create_user_id as createUserId
         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

@@ -899,9 +899,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         } else {
             commMap.put("approvalStatus", op);
         }
+        commMap.put("approvalStatus", op);
         workDto.setVariable(commMap);
         workDto.setComment(jgTransferNotice.getProcessAdvice());
-        workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCreditCode());
+        workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCreditCode());
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
         // 提取节点等信息
         workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);

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

@@ -730,6 +730,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             commMap.put("approvalStatus", op);
         }
         workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCode());
+        workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCode());
         workDto.setVariable(commMap);
         workDto.setComment(opinion);
         processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);