fix(JG)：告知书-告知书编号生成规则调整

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

@@ -90,7 +90,7 @@
             isn.install_leader_name AS installLeaderName,
             isn.install_leader_phone AS installLeaderPhone,
             isn.use_unit_name AS useUnitName,
-
+            isn.inform_number AS informNumber,
             tec2.name                       AS equCategory,
             tec1.name                       AS equList,
             tec.name                        AS equDefine,

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

@@ -80,6 +80,7 @@
                isn.plan_date                  AS installStartDate,
                isn.construction_manager       AS installLeaderName,
                isn.construction_manager_phone AS installLeaderPhone,
+               isn.inform_number              AS informNumber,
                ri.equ_list                    AS equList,
                ri.equ_category                AS equCategory,
                ri.EQU_DEFINE                  AS equDefine,

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

@@ -97,8 +97,9 @@
                isn.plan_date                  AS installStartDate,
                isn.construction_manager       AS installLeaderName,
                isn.construction_manager_phone AS installLeaderPhone,
+               isn.inform_number              AS informNumber,
                ri.equ_code                    AS equRegisterCode,
-               fi.FACTORY_NUM                 AS produceCode,
+               fi.FACTORY_NUM                  AS produceCode,
                ri.product_name                AS productName,
                ri.brand_name                  AS brandName,
                ri.equ_type                    AS equType,

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

@@ -128,6 +128,7 @@
             oi.SUPERVISORY_CODE as supervisoryCode,
             tjtn.construction_manager AS installLeaderName,
             tjtn.construction_manager_phone AS installLeaderPhone,
+            tjtn.inform_number AS informNumber,
             ri.EQU_CODE AS equRegisterCode,
             ri.PRODUCT_NAME AS productName,
             ri.BRAND_NAME AS brandName,

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

@@ -768,7 +768,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                 queryWrapper2.eq(RegistrationInfo::getRecord, jgRelationEquip.getEquId());
                 RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
-                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgMaintainNotice.getReceiveOrgCode()).append(ym);
+                stringBuffer.append(tzsJgRegistrationInfo.getEquCategory()).append(jgMaintainNotice.getReceiveCompanyCode()).append(ym);
                 String equCode = stringBuffer.toString();
                 ResponseModel<String> responseModel  = tzsServiceFeignClient.deviceRegistrationCode(equCode);
                 String deviceRegistrationCode = responseModel.getResult();
@@ -776,10 +776,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
                 jgMaintainNotice.setAcceptDate(new Date());
                 jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
                 jgMaintainNotice.setPromoter("");
                 jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
+
                 // 上个代办改为已办
                 HashMap<String, Object> taskMap = new HashMap<>();
                 taskMap.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
@@ -791,6 +790,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 BeanUtils.copyProperties(jgMaintainNotice, taskMessageDto);
                 taskMap.put("model", taskMessageDto);
                 commonService.updateTaskModel(taskMap);
+
+                jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+                jgMaintainNoticeMapper.updateById(jgMaintainNotice);
+                this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
             } else {
                 jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                 if (!ObjectUtils.isEmpty(jgMaintainNotice.getInstanceStatus())) {
@@ -821,6 +825,10 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+
+                jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+                jgMaintainNoticeMapper.updateById(jgMaintainNotice);
             }
         } else {
             jgMaintainNotice.setPromoter("");
@@ -847,10 +855,12 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
             taskModelDto.setPageType("edit");
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+
+            jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+            jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
+            jgMaintainNoticeMapper.updateById(jgMaintainNotice);
         }
-        jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-        jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
-        jgMaintainNoticeMapper.updateById(jgMaintainNotice);
+
     }
 
     private TaskResultDTO assembleData(JgMaintainNotice jgMaintainNotice, String op, String opinion) {

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

@@ -762,9 +762,10 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
                 jgReformNotice.setAcceptDate(new Date());
                 jgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                this.generateInstallationNoticeReport(jgReformNotice.getSequenceNbr());
                 jgReformNotice.setPromoter("");
                 this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
+                this.updateById(jgReformNotice);
+                this.generateInstallationNoticeReport(jgReformNotice.getSequenceNbr());
             } else {
                 jgReformNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                 if (!ObjectUtils.isEmpty(jgReformNotice.getInstanceStatus())) {
@@ -779,6 +780,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 taskV2Model = this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
                 // 创建新的代办
                 this.createNewTodo(jgReformNotice, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_PROCESSED);
+                jgReformNoticeMapper.updateById(jgReformNotice);
             }
         } else {
             jgReformNotice.setPromoter("");
@@ -792,8 +794,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             // 上个代办改为驳回
             taskV2Model = this.updateLastTodo(jgReformNotice, FlowStatusEnum.REJECTED);
             this.createNewTodo(jgReformNotice, workflowResultDto, taskV2Model, FlowStatusEnum.REJECTED);
+            jgReformNoticeMapper.updateById(jgReformNotice);
         }
-        jgReformNoticeMapper.updateById(jgReformNotice);
     }
 
     /**

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

@@ -721,7 +721,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 jgTransferNotice.setPromoter("");
                 jgTransferNotice.setHandleDate(new Date());
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
-                this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
+
 
                 Map<String,Object> map1 =new HashMap<>();
                 Map<String,Map<String,Object>> objMap = new HashMap<>();
@@ -757,6 +757,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
                 taskMap.put("model", taskMessageDto);
                 taskV2Model = commonService.updateTaskModel(taskMap);
+
+                jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+                jgTransferNoticeMapper.updateById(jgTransferNotice);
+                this.generateTransferNoticeReport(jgTransferNotice.getSequenceNbr());
             } else {
                 jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                 jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
@@ -788,6 +793,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
                 taskModelDto.setModel(taskMessageDto);
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+                jgTransferNoticeMapper.updateById(jgTransferNotice);
             }
         } else {
             jgTransferNotice.setPromoter("");
@@ -814,11 +822,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
             commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+            jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+            jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
+            jgTransferNoticeMapper.updateById(jgTransferNotice);
         }
-        jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-        jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
-        jgTransferNoticeMapper.updateById(jgTransferNotice);
-
     }
 
     /**