使用登记报错为批量回滚es将equipId放入list中

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

@@ -1204,6 +1204,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfoMapper.updateById(useInfo);
         // 更新es
+        //为批量回滚es将equipId放入list中
+        mapData.put("equipId", new ArrayList<>().add(mapData.get("equipId")));
         updateEsData(usePlace, mapData, otherInfo, jgUseRegistration, jsonObject, Boolean.FALSE);
         jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
                 .applyNo(jgUseRegistration.getApplyNo())
@@ -1292,31 +1294,34 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 更新es
         HashMap<String, Map<String, Object>> objMap = new HashMap<>();
         HashMap<String, Object> param = new HashMap<>();
-        if (rollBake) {
-            param.put("EQU_STATE", EquimentEnum.WEIDENGJI.getCode());
-            param.put("IS_INTO_MANAGEMENT", Boolean.FALSE);
-            param.put("USE_ORG_CODE", null);
-        } else {
-            // 属地监管部门拆分
-            String orgBranch = (String) dataMap.getOrDefault("orgBranchCode", "_");
-            String[] split = orgBranch.split("_");
-            param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
-            param.put("CODE96333", otherInfo.getCode96333());
-            param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
-            param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
-            param.put("ADDRESS", dataMap.getOrDefault("address", ""));
-            param.put("USE_PLACE", usePlace);
-            param.put("STATUS", "已认领");
-            param.put("EQU_STATE", 1);
-            param.put("IS_INTO_MANAGEMENT", true);
-            param.put("USE_SITE_CODE", jsonObject.get("province") + "#" + jsonObject.get("city") + "#" + jsonObject.get("county") + "#" + jsonObject.get("factoryUseSiteStreet"));
-            param.put("USE_PLACE_CODE", String.valueOf(jsonObject.get("usePlace")));
-            param.put("ORG_BRANCH_CODE", split[0]);
-            param.put("ORG_BRANCH_NAME", split[1]);
-            param.put("EQU_CODE", dataMap.get("equCode"));
-            param.put("USE_ORG_CODE", jgUseRegistration.getUseRegistrationCode());
-        }
-        objMap.put((String) dataMap.get("equipId"), param);
+        List<String> equipIds = (List<String>) dataMap.get("equipId");
+        for (String equipId : equipIds) {
+            if (rollBake) {
+                param.put("EQU_STATE", EquimentEnum.WEIDENGJI.getCode());
+                param.put("IS_INTO_MANAGEMENT", Boolean.FALSE);
+                param.put("USE_ORG_CODE", null);
+            } else {
+                // 属地监管部门拆分
+                String orgBranch = (String) dataMap.getOrDefault("orgBranchCode", "_");
+                String[] split = orgBranch.split("_");
+                param.put("SUPERVISORY_CODE", otherInfo.getSupervisoryCode());
+                param.put("CODE96333", otherInfo.getCode96333());
+                param.put("USE_UNIT_CREDIT_CODE", dataMap.get("useUnitCreditCode"));
+                param.put("USE_UNIT_NAME", dataMap.get("useUnitName"));
+                param.put("ADDRESS", dataMap.getOrDefault("address", ""));
+                param.put("USE_PLACE", usePlace);
+                param.put("STATUS", "已认领");
+                param.put("EQU_STATE", 1);
+                param.put("IS_INTO_MANAGEMENT", true);
+                param.put("USE_SITE_CODE", jsonObject.get("province") + "#" + jsonObject.get("city") + "#" + jsonObject.get("county") + "#" + jsonObject.get("factoryUseSiteStreet"));
+                param.put("USE_PLACE_CODE", String.valueOf(jsonObject.get("usePlace")));
+                param.put("ORG_BRANCH_CODE", split[0]);
+                param.put("ORG_BRANCH_NAME", split[1]);
+                param.put("EQU_CODE", dataMap.get("equCode"));
+                param.put("USE_ORG_CODE", jgUseRegistration.getUseRegistrationCode());
+            }
+            objMap.put(equipId, param);
+        }
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }
 
@@ -1385,11 +1390,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             commonService.checkForExecuteFlow(nextTaskId, instanceId);
 
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
-            LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
-                    .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
-            JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
-            recordJsonObject.put("equipId", jgUseRegistrationEq.getEquId());
             if (!ObjectUtils.isEmpty(carNumber)) {
+                LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
+                        .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
+                JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
+                recordJsonObject.put("equipId", new ArrayList<>().add(jgUseRegistrationEq.getEquId()));
                 // 更新安全追溯-场内车辆中的“车牌号字段” 保证唯一性
                 LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(IdxBizJgRegisterInfo::getCarNumber, carNumber);
@@ -1431,7 +1436,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 // 按单位办理
                 if ("unit".equals(manageType)) {
                     this.updateUseRegUnitData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, false, jsonObject);
+                    LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
+                            .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
+                    List<JgUseRegistrationEq> jgUseRegistrationEq = jgRelationEquipMapper.selectList(eq);
+                    List<String> equipIds = jgUseRegistrationEq.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList());
+                    recordJsonObject.put("equipId", equipIds);
                 } else {
+                    LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda()
+                            .eq(JgUseRegistrationEq::getEquipTransferId, jgUseRegistration.getSequenceNbr());
+                    List<JgUseRegistrationEq> jgUseRegistrationEq = jgRelationEquipMapper.selectList(eq);
+                    List<String> equipIds = jgUseRegistrationEq.stream().map(JgUseRegistrationEq::getEquId).collect(Collectors.toList());
+                    recordJsonObject.put("equipId", equipIds);
                     this.updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, carNumber, false, jsonObject);
                 }
             }