fix(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/IdxBizJgRegisterInfoServiceImpl.java

@@ -1541,6 +1541,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             // 历史设备且做过历史登记
             BoolQueryBuilder hisBuilder = QueryBuilders.boolQuery();
             hisBuilder.must(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his"));
+            hisBuilder.mustNot(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his_ymt"));//排除一码通设备
             hisBuilder.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
             dBuilder.should(hisBuilder);
             // 或新设备

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

@@ -353,23 +353,23 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         // 再插入新代办、数据待定
         commonService.buildTaskModel(Collections.singletonList(modelDto));
         // 新增人员履历消息表
-        LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
-        lambda.eq(JgMaintenanceContractEq::getEquipTransferId, contract.getSequenceNbr());
-        List<JgMaintenanceContractEq> jgMaintenanceContractEqList = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
-        jgResumeInfoService.saveBatchResume(
-                jgMaintenanceContractEqList.stream()
-                        .map(v -> JgResumeInfoDto.builder()
-                                .applyNo(contract.getApplyNo())
-                                .businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
-                                .businessId(String.valueOf(contract.getSequenceNbr()))
-                                .equId(String.valueOf(v.getEquId()))
-                                .approvalUnit(contract.getReceiveOrgName())
-                                .approvalUnitCode(contract.getReceiveOrgCode())
-                                .status("正常")
-                                .routePath(taskV2Model.getRoutePath())
-                                .build())
-                        .collect(Collectors.toList())
-        );
+        //LambdaQueryWrapper<JgMaintenanceContractEq> lambda = new QueryWrapper<JgMaintenanceContractEq>().lambda();
+        //lambda.eq(JgMaintenanceContractEq::getEquipTransferId, contract.getSequenceNbr());
+        //List<JgMaintenanceContractEq> jgMaintenanceContractEqList = jgMaintenanceContractEqService.getBaseMapper().selectList(lambda);
+        //jgResumeInfoService.saveBatchResume(
+        //        jgMaintenanceContractEqList.stream()
+        //                .map(v -> JgResumeInfoDto.builder()
+        //                        .applyNo(contract.getApplyNo())
+        //                        .businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
+        //                        .businessId(String.valueOf(contract.getSequenceNbr()))
+        //                        .equId(String.valueOf(v.getEquId()))
+        //                        .approvalUnit(contract.getReceiveOrgName())
+        //                        .approvalUnitCode(contract.getReceiveOrgCode())
+        //                        .status("正常")
+        //                        .routePath(taskV2Model.getRoutePath())
+        //                        .build())
+        //                .collect(Collectors.toList())
+        //);
     }
 
 
@@ -675,9 +675,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             contract.setApplyDate(new Date());
             contract.setStatus(taskCode);
             contract.setNextTaskId(null);
-            updateTaskModel(contract, "0");
+            TaskV2Model taskV2Model = updateTaskModel(contract, "0");
             // 添加设备维保信息
-            updateEquipMessage(contract.getSequenceNbr());
+            updateEquipMessage(contract.getSequenceNbr(), taskV2Model);
         }
         this.getBaseMapper().updateById(contract);
 
@@ -691,7 +691,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      * @param id
      */
     @SneakyThrows
-    private void updateEquipMessage(Long id) {
+    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);
@@ -716,6 +716,21 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             info.setRepairInform(ObjectUtils.isEmpty(jgMaintenanceContract.getMaintenanceContract()) ? null : jgMaintenanceContract.getMaintenanceContract());
             maintenanceRecordInfoList.add(info);
         });
+
+        jgResumeInfoService.saveBatchResume(
+                list.stream()
+                        .map(v -> JgResumeInfoDto.builder()
+                                .applyNo(jgMaintenanceContract.getApplyNo())
+                                .businessType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName())
+                                .businessId(String.valueOf(jgMaintenanceContract.getSequenceNbr()))
+                                .equId(String.valueOf(v.getEquId()))
+                                .approvalUnit(jgMaintenanceContract.getReceiveOrgName())
+                                .approvalUnitCode(jgMaintenanceContract.getReceiveOrgCode())
+                                .status("正常")
+                                .routePath(taskV2Model.getRoutePath())
+                                .build())
+                        .collect(Collectors.toList())
+        );
         idxBizJgMaintenanceRecordInfoService.saveBatch(maintenanceRecordInfoList);
         // 维保备案后更新安全追溯对应设备状态
         emqKeeper.getMqttClient().publish(SafetyProblemTypeEnum.WBBA.getTopic(), JSON.toJSONBytes(maintenanceRecordInfoList), 2, false);