修改bug

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

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 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.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
@@ -81,6 +82,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     IJgInstallationNoticeService jrmInstallationNoticeService;
 
+    @Autowired
+    private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
+
     /**
      * 分页查询
      */
@@ -507,10 +511,39 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             contract.setApplyDate(new Date());
             contract.setStatus(taskCode);
             updateTaskModel(contract, "0");
+            // 添加设备维保信息
+            updateEquipMessage(contract.getSequenceNbr());
         }
         this.getBaseMapper().updateById(contract);
     }
 
+    /**
+     * 流程结束后添加设备维保信息
+     *
+     * @param id
+     */
+    private void updateEquipMessage(Long id) {
+        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);
+        ArrayList<IdxBizJgMaintenanceRecordInfo> data = new ArrayList<>();
+        list.forEach(item -> {
+            IdxBizJgMaintenanceRecordInfo info = new IdxBizJgMaintenanceRecordInfo();
+            info.setRecord(item.getEquId());
+            info.setMeUnitName(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitName()) ? null : jgMaintenanceContract.getMaintenanceUnitName());
+            info.setMeUnitCreditCode(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceUnitCode()) ? null : jgMaintenanceContract.getMaintenanceUnitCode());
+            info.setMeMaster(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOneName()) ? null : jgMaintenanceContract.getMaintenanceManagerOneName());
+            info.setEmergencycall(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceManagerOnePhone()) ? null : jgMaintenanceContract.getMaintenanceManagerOnePhone());
+            info.setInformStart(ObjectUtils.isEmpty(jgMaintenanceContract.getInformStart()) ? null : jgMaintenanceContract.getInformStart());
+            info.setInformEnd(ObjectUtils.isEmpty(jgMaintenanceContract.getInformEnd()) ? null : jgMaintenanceContract.getInformEnd());
+            info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
+            data.add(info);
+        });
+        idxBizJgMaintenanceRecordInfoService.saveBatch(data);
+    }
+
+
     private TaskV2Model updateTaskModel(JgMaintenanceContract contract, String operate) {
         Map<String, Object> params = new HashMap<>();
         FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);

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

@@ -92,6 +92,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     CommonServiceImpl commonServiceImpl;
     @Autowired
     CmWorkflowServiceImpl cmWorkflowService;
+    @Autowired
+    IdxBizJgSupervisionInfoMapper idxBizJgSupervisionInfoMapper;
 
     private static final String DEFINITION_KEY = "useRegistration";
 
@@ -166,8 +168,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
         inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("equipId"));
         // 更新检验检测信息
-        inspectionDetectionInfo.setInspectReport(null);
+//        inspectionDetectionInfo.setInspectReport(null);
         inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        // 更新设备监管部门
+        IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
+        if (map.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
+            String[] data = String.valueOf(map.getString("orgBranchCode")).split("_");
+            idxBizJgSupervisionInfo.setOrgBranchCode(data[0]);
+            idxBizJgSupervisionInfo.setOrgBranchName(data[1]);
+            LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda().eq(IdxBizJgSupervisionInfo::getRecord, map.get("equipId"));
+            idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);
+        }
         // 更新设备使用登记证
         idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), useOrgCode);
         // 更新es
@@ -274,6 +285,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setUseUnitCreditCode(null);
             jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
             this.getBaseMapper().updateById(jgUseRegistration);
+            // 更新设备关联表
+            LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
+            lambda.eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
+            JgUseRegistrationEq jgUseRegistrationEq = new JgUseRegistrationEq();
+            jgUseRegistrationEq.setEquId(map.get("equipId").toString());
+            jgRelationEquipMapper.update(jgUseRegistrationEq, lambda);
         } else {
 
             // 业务管理设备信息保存