feat(jg): 设备业务履历

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

@@ -196,6 +196,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     @Autowired
     private EventPublisher eventPublisher;
 
+    @Autowired
+    JgResumeInfoServiceImpl jgResumeInfoService;
+
     /***
      * @deprecated 根据查询调教获取分页对象
      * @param dto 查询的dto对象
@@ -651,6 +654,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 // 生成流水信息
                 saveRecord(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform, taskV2Model);
                 this.clearUscWInfo(jgChangeRegistrationReform);
+                //  创建设备履历
+                this.createResume(jgChangeRegistrationReformEq, jgChangeRegistrationReform, taskV2Model.getRoutePath());
             }  else {                                                                                         // 压力管道逻辑
                 // 1.批量更新技术参数
                 // 1.1 技术参数更新
@@ -659,6 +664,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 saveCertFlowBatch(jgChangeRegistrationReform, paramsPipelines, taskV2Model);
                 // 3.清除设备及装置的安改维单位信息
                 this.clearUscWithEquipAndCon(jgChangeRegistrationReform);
+                //  创建设备履历
+                this.createResume(jgChangeRegistrationReform, taskV2Model.getRoutePath());
             }
             this.sendDataRefreshMsg(jgChangeRegistrationReform);
         }
@@ -667,6 +674,50 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
 
+    /**
+     * 压力管道逻辑
+     * @param jgChangeRegistrationReform 主表
+     * @param routePath 详情
+     */
+    private void createResume(JgChangeRegistrationReform jgChangeRegistrationReform, String routePath) {
+        jgResumeInfoService.saveBatchResume(Collections.singletonList(
+                        JgResumeInfoDto.builder()
+                                .applyNo(jgChangeRegistrationReform.getApplyNo())
+                                .businessType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName())
+                                .businessId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()))
+                                .equId(jgChangeRegistrationReform.getProjectContraptionId())
+                                .approvalUnit(jgChangeRegistrationReform.getReceiveOrgName())
+                                .approvalUnitCode(jgChangeRegistrationReform.getReceiveCompanyCode())
+                                .status("正常")
+                                .changeContent(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName() + "业务办理")
+                                .routePath(routePath)
+                                .build()
+                )
+        );
+    }
+
+    /**
+     * 非压力管道逻辑
+     * @param jgChangeRegistrationReform 主表
+     * @param routePath 详情
+     */
+    private void createResume(JgChangeRegistrationReformEq jgChangeRegistrationReformEq, JgChangeRegistrationReform jgChangeRegistrationReform, String routePath) {
+        jgResumeInfoService.saveBatchResume(Collections.singletonList(
+                        JgResumeInfoDto.builder()
+                                .applyNo(jgChangeRegistrationReform.getApplyNo())
+                                .businessType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName())
+                                .businessId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()))
+                                .equId(jgChangeRegistrationReformEq.getEquId())
+                                .approvalUnit(jgChangeRegistrationReform.getReceiveOrgName())
+                                .approvalUnitCode(jgChangeRegistrationReform.getReceiveCompanyCode())
+                                .status("正常")
+                                .changeContent(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName() + "业务办理")
+                                .routePath(routePath)
+                                .build()
+                )
+        );
+    }
+
     private void sendDataRefreshMsg(JgChangeRegistrationReform jgChangeRegistrationReform) {
         List<String> records = new ArrayList<>();
         if(StringUtils.isNotEmpty(jgChangeRegistrationReform.getProjectContraptionId())){

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

@@ -26,7 +26,6 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
-import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.EquipTransferVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
@@ -41,8 +40,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -90,16 +87,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
     private static final String SUBMIT_TYPE_FLOW = "1";
     private final JgEquipTransferEqMapper jgEquipTransferEqMapper;
-    private final EquipmentCategoryMapper equipmentCategoryMapper;
-    ;
     private final JgEquipTransferEqServiceImpl equipTransferEqService;
     private final RedisUtils redisUtils;
     private final TzsServiceFeignClient tzsServiceFeignClient;
-    private final IdxBizJgOtherInfoServiceImpl idxBizJgOtherInfoServiceImpl;
-    private final IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoServiceImpl;
     private final IdxBizJgUseInfoServiceImpl idxBizJgUseInfoServiceImpl;
     private final CmWorkflowServiceImpl cmWorkflowService;
-    private final IJgInstallationNoticeService jrmInstallationNoticeService;
     private final IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
     private final IdxBizJgProjectContraptionServiceImplService jgProjectContraptionService;
     @Lazy
@@ -113,8 +105,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
 
     @Autowired
     private final EsEquipmentDao esEquipmentDao;
+
     @Autowired
-    private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
+    private JgResumeInfoServiceImpl jgResumeInfoService;
 
     /**
      * 保存和保存并提交
@@ -575,7 +568,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
                         });
                     }
                     // 上个代办改为已办
-                    this.updateLastTodo(jgEquipTransfer, FlowStatusEnum.TO_BE_FINISHED);
+                    TaskV2Model taskV2Model1 = this.updateLastTodo(jgEquipTransfer, FlowStatusEnum.TO_BE_FINISHED);
+                    //  创建设备履历
+                    this.createResume(jgEquipTransferEqs, jgEquipTransfer, taskV2Model1.getRoutePath());
                 } else {
                     jgEquipTransfer.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     if (!ObjectUtils.isEmpty(jgEquipTransfer.getInstanceStatus())) {
@@ -617,6 +612,37 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         }
     }
 
+    private void createResume(List<JgEquipTransferEq> equipTransferEqList, JgEquipTransfer equipTransfer, String routePath) {
+        if(StringUtils.hasText(equipTransfer.getProjectContraptionSeq())){
+            jgResumeInfoService.saveBatchResume(Collections.singletonList(
+                            JgResumeInfoDto.builder()
+                                    .applyNo(equipTransfer.getApplyNo())
+                                    .businessType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName())
+                                    .businessId(String.valueOf(equipTransfer.getSequenceNbr()))
+                                    .equId(equipTransfer.getProjectContraptionSeq())
+                                    .approvalUnit(equipTransfer.getInstallUnitName())
+                                    .approvalUnitCode(equipTransfer.getInstallUnitCreditCode())
+                                    .status("正常")
+                                    .changeContent(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName() + "业务办理")
+                                    .routePath(routePath)
+                                    .build()
+                    )
+            );
+        } else {
+            jgResumeInfoService.saveBatchResume(equipTransferEqList.stream().map(eq-> JgResumeInfoDto.builder().applyNo(equipTransfer.getApplyNo())
+                    .businessType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName())
+                    .businessId(String.valueOf(equipTransfer.getSequenceNbr()))
+                    .equId(eq.getEquId())
+                    .approvalUnit(equipTransfer.getInstallUnitName())
+                    .approvalUnitCode(equipTransfer.getInstallUnitCreditCode())
+                    .status("正常")
+                    .changeContent(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName() + "业务办理")
+                    .routePath(routePath)
+                    .build()).collect(Collectors.toList())
+            );
+        }
+    }
+
     private void writeUsc2UseInfo(JgEquipTransferEq equipTransferEq, JgEquipTransfer jgEquipTransfer) {
         LambdaUpdateWrapper<IdxBizJgUseInfo> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         lambdaUpdateWrapper.eq(IdxBizJgUseInfo::getRecord, equipTransferEq.getEquId());

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

@@ -37,7 +37,6 @@ import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICompensateFlowDataOfRedis;
-import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
@@ -144,7 +143,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     private CmWorkflowServiceImpl cmWorkflowService;
 
     @Autowired
-    IIdxBizJgRegisterInfoService idxBizJgRegisterInfoService;
+    JgResumeInfoServiceImpl jgResumeInfoService;
 
     @Autowired
     JgInstallationNoticeServiceImpl jgInstallationNoticeService;
@@ -998,8 +997,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 if (StringUtils.isEmpty(workflowResultDto.getNextExecutorRoleIds())) {
                     LambdaQueryWrapper<JgMaintainNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(JgMaintainNoticeEq::getEquipTransferId, dto.getSequenceNbr());
-                    List<JgMaintainNoticeEq> jgRelationEquip = jgMaintainNoticeEqMapper.selectList(queryWrapper);
-                    for (JgMaintainNoticeEq jgMaintainNoticeEq : jgRelationEquip) {
+                    List<JgMaintainNoticeEq> jgMaintainNoticeEqs = jgMaintainNoticeEqMapper.selectList(queryWrapper);
+                    for (JgMaintainNoticeEq jgMaintainNoticeEq : jgMaintainNoticeEqs) {
                         LambdaQueryWrapper<RegistrationInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                         queryWrapper2.eq(RegistrationInfo::getRecord, jgMaintainNoticeEq.getEquId());
                         RegistrationInfo tzsJgRegistrationInfo = tzsJgRegistrationInfoMapper.selectOne(queryWrapper2);
@@ -1009,7 +1008,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
                         jgMaintainNoticeEq.setInformNumber(responseModel.getResult());
                     }
-                    jgMaintainNoticeEqService.saveOrUpdateBatch(jgRelationEquip);
+                    jgMaintainNoticeEqService.saveOrUpdateBatch(jgMaintainNoticeEqs);
 
                     jgMaintainNotice.setAcceptDate(new Date());
                     jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
@@ -1036,7 +1035,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                     commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName(), jsonObject, "", jgMaintainNotice.getSequenceNbr().toString());
 
                     // 保存流水表
-                    saveRecord(jgMaintainNotice, jgRelationEquip, taskV2Model1.getRoutePath());
+                    saveRecord(jgMaintainNotice, jgMaintainNoticeEqs, taskV2Model1.getRoutePath());
+                    //  创建设备履历
+                    this.createResume(jgMaintainNoticeEqs, jgMaintainNotice, taskV2Model1.getRoutePath());
                 } else {
                     jgMaintainNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     if (!ObjectUtils.isEmpty(jgMaintainNotice.getInstanceStatus())) {
@@ -1113,6 +1114,37 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
     }
 
+    private void createResume(List<JgMaintainNoticeEq> jgRelationEquips, JgMaintainNotice notice, String routePath) {
+        if(StringUtils.hasText(notice.getProjectContraptionId())){
+            jgResumeInfoService.saveBatchResume(Collections.singletonList(
+                            JgResumeInfoDto.builder()
+                                    .applyNo(notice.getApplyNo())
+                                    .businessType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName())
+                                    .businessId(String.valueOf(notice.getSequenceNbr()))
+                                    .equId(notice.getProjectContraptionId())
+                                    .approvalUnit(notice.getReceiveOrgName())
+                                    .approvalUnitCode(notice.getReceiveCompanyCode())
+                                    .status("正常")
+                                    .changeContent(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName() + "业务办理")
+                                    .routePath(routePath)
+                                    .build()
+                    )
+            );
+        } else {
+            jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq-> JgResumeInfoDto.builder().applyNo(notice.getApplyNo())
+                    .businessType(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName())
+                    .businessId(String.valueOf(notice.getSequenceNbr()))
+                    .equId(eq.getEquId())
+                    .approvalUnit(notice.getReceiveOrgName())
+                    .approvalUnitCode(notice.getReceiveCompanyCode())
+                    .status("正常")
+                    .changeContent(BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName() + "业务办理")
+                    .routePath(routePath)
+                    .build()).collect(Collectors.toList())
+            );
+        }
+    }
+
     private void saveRecord(JgMaintainNotice jgMaintainNotice, List<JgMaintainNoticeEq> jgMaintainNoticeEqList, String routePath) {
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
@@ -1138,7 +1170,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         changeRecord.setCreateUserId(reginParams.getUserModel().getUserId());
         changeRecord.setRoutePath(routePath);
         certificateChangeRecords.add(changeRecord);
-        jgMaintainNoticeEqList.stream().forEach(e -> {
+        jgMaintainNoticeEqList.forEach(e -> {
             JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
             changeRecordEq.setChangeRecordId(changeRecord.getSequenceNbr().toString()); //登记证记录主键
             changeRecordEq.setEquId(e.getEquId()); //设备主键
@@ -1146,10 +1178,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             changeRecordEqList.add(changeRecordEq);
         });
 
-        if (certificateChangeRecords.size() > 0) {
-            certificateChangeRecordService.saveBatch(certificateChangeRecords);
-        }
-        if (changeRecordEqList.size() > 0) {
+        certificateChangeRecordService.saveBatch(certificateChangeRecords);
+        if (!changeRecordEqList.isEmpty()) {
             jgCertificateChangeRecordEqServiceImpl.saveBatch(changeRecordEqList);
         }
     }

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

@@ -677,7 +677,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         String taskName = "";
         String nextTaskId = "";
         JgMaintenanceContract contract = this.getBaseMapper().selectById(sequenceNbr);
-        if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
+        if (processTaskDTO != null && processTaskDTO.getNextTask() != null && !processTaskDTO.getNextTask().isEmpty()) {
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
             taskName = processTaskDTO.getNextTask().get(0).getName();
             nextTaskId = processTaskDTO.getNextTask().get(0).getId();
@@ -717,6 +717,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             updateEquipMessage(contract.getSequenceNbr(), taskV2Model);
             // 发送数据刷新消息
             this.sendDataRefreshMsg(sequenceNbr);
+            //  创建设备履历
+            this.createResume(contract, taskV2Model.getRoutePath());
         }
         this.getBaseMapper().updateById(contract);
 
@@ -724,6 +726,21 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(contract));
     }
 
+    private void createResume(JgMaintenanceContract maintenanceContract, String routePath) {
+        List<JgMaintenanceContractEq> maintenanceContractEqs = getJgMaintenanceContractEqs(maintenanceContract.getSequenceNbr());
+        jgResumeInfoService.saveBatchResume(maintenanceContractEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(maintenanceContract.getApplyNo())
+                .businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
+                .businessId(String.valueOf(maintenanceContract.getSequenceNbr()))
+                .equId(eq.getEquId())
+                .approvalUnit(maintenanceContract.getReceiveOrgName())
+                .approvalUnitCode(maintenanceContract.getReceiveOrgCode())
+                .status("正常")
+                .changeContent(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName() + "业务办理")
+                .routePath(routePath)
+                .build()).collect(Collectors.toList())
+        );
+    }
+
     private void sendDataRefreshMsg(Long sequenceNbr) {
         eventPublisher.publish(new DataRefreshEvent(this,getRecords(sequenceNbr), DataRefreshEvent.DataType.equipment.name(), DataRefreshEvent.Operation.UPDATE));
     }
@@ -736,9 +753,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @SneakyThrows
     private void updateEquipMessage(Long id, TaskV2Model taskV2Model) {
         JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectById(id);
-        LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
-        lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
-        List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
+        List<JgMaintenanceContractEq> list = getJgMaintenanceContractEqs(id);
         List<IdxBizJgMaintenanceRecordInfo> maintenanceRecordInfoList = new ArrayList<>();
         // 循环设备
         list.forEach(item -> {
@@ -795,6 +810,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(maintenanceRecordInfoList), 2, false);
     }
 
+    private List<JgMaintenanceContractEq> getJgMaintenanceContractEqs(Long id) {
+        LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
+        lambda.eq(JgMaintenanceContractEq::getEquipTransferId, id);
+        return jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
+    }
+
 
     private TaskV2Model updateTaskModel(JgMaintenanceContract contract, String operate) {
         Map<String, Object> params = new HashMap<>();

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

@@ -143,6 +143,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private final IdxBizJgInspectionDetectionInfoServiceImpl idxBizJgInspectionDetectionInfoService;
     private final IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
     private final JgUseRegistrationServiceImpl useRegistrationService;
+    private final JgResumeInfoServiceImpl jgResumeInfoService;
+
 
     @Autowired
     @Lazy
@@ -996,9 +998,11 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                     jgReformNotice.setPromoter("");
                     // 压力管道情况处理
                     this.YLGDDataPassHandler(jgReformNotice);
-                    this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
+                    TaskV2Model taskV2Model1 = this.updateLastTodo(jgReformNotice, FlowStatusEnum.TO_BE_FINISHED);
                     this.updateById(jgReformNotice);
                     this.sendDataRefreshMsg(jgReformNotice, noticeEqs);
+                    //  创建设备履历
+                    this.createResume(noticeEqs, jgReformNotice, taskV2Model1.getRoutePath());
                 } else {
                     jgReformNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     if (!ObjectUtils.isEmpty(jgReformNotice.getInstanceStatus())) {
@@ -1037,6 +1041,37 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         }
     }
 
+    private void createResume(List<JgReformNoticeEq> jgRelationEquips, JgReformNotice notice, String routePath) {
+        if(StringUtils.hasText(notice.getProjectContraptionId())){
+            jgResumeInfoService.saveBatchResume(Collections.singletonList(
+                            JgResumeInfoDto.builder()
+                                    .applyNo(notice.getApplyNo())
+                                    .businessType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName())
+                                    .businessId(String.valueOf(notice.getSequenceNbr()))
+                                    .equId(notice.getProjectContraptionId())
+                                    .approvalUnit(notice.getReceiveOrgName())
+                                    .approvalUnitCode(notice.getReceiveCompanyCode())
+                                    .status("正常")
+                                    .changeContent(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName() + "业务办理")
+                                    .routePath(routePath)
+                                    .build()
+                    )
+            );
+        } else {
+            jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq-> JgResumeInfoDto.builder().applyNo(notice.getApplyNo())
+                    .businessType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName())
+                    .businessId(String.valueOf(notice.getSequenceNbr()))
+                    .equId(eq.getEquId())
+                    .approvalUnit(notice.getReceiveOrgName())
+                    .approvalUnitCode(notice.getReceiveCompanyCode())
+                    .status("正常")
+                    .changeContent(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getName() + "业务办理")
+                    .routePath(routePath)
+                    .build()).collect(Collectors.toList())
+            );
+        }
+    }
+
     private void sendDataRefreshMsg(JgReformNotice jgReformNotice, List<JgReformNoticeEq> noticeEqs) {
         List<String> records;
         if(!StringUtils.isEmpty(jgReformNotice.getProjectContraptionId())){

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

@@ -28,7 +28,6 @@ import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.TransferVo;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
-import com.yeejoin.amos.boot.module.jg.biz.dao.ESElavtorRepository;
 import com.yeejoin.amos.boot.module.jg.biz.edit.permission.FillingEditPermForCurrentUser;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
@@ -122,8 +121,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
     @Autowired
     JgTransferNoticeEqServiceImpl jgTransferNoticeEqService;
+
     @Autowired
-    ESElavtorRepository esElavtorRepository;
+    JgResumeInfoServiceImpl jgResumeInfoService;
     @Autowired
     JgVehicleInformationMapper jgVehicleInformationMapper;
 
@@ -945,11 +945,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
                     taskMap.put("model", taskMessageDto);
-                    commonService.updateTaskModel(taskMap);
+                    TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
 
                     jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                     jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     jgTransferNoticeMapper.updateById(jgTransferNotice);
+                    //  创建设备履历
+                    this.createResume(jgTransferNoticeEqs,jgTransferNotice, taskV2Model1.getRoutePath());
                 } else {
                     jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
                     jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
@@ -1025,6 +1027,21 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
     }
 
+    private void createResume(List<JgTransferNoticeEq> jgRelationEquips, JgTransferNotice notice, String routePath) {
+        jgResumeInfoService.saveBatchResume(jgRelationEquips.stream().map(eq-> JgResumeInfoDto.builder().applyNo(notice.getApplyNo())
+                .businessType(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName())
+                .businessId(String.valueOf(notice.getSequenceNbr()))
+                .equId(eq.getEquId())
+                .approvalUnit(notice.getReceiveOrgName())
+                .approvalUnitCode(notice.getReceiveCompanyCode())
+                .status("正常")
+                .changeContent(BusinessTypeEnum.JG_ADVICE_REMOVAL.getName() + "业务办理")
+                .routePath(routePath)
+                .build()).collect(Collectors.toList())
+        );
+    }
+
+
     private void updateEq(JgTransferNotice jgTransferNotice) {
         // 组装设备注册代码
         String ym = null;