Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -155,17 +155,17 @@ public class BatchDataChangeProcessStrategy implements IChangeDataProcessStrateg
         List<String> records = eqs.stream().map(JgUseRegistrationEq::getEquId).collect(toList());
         IdxBizJgRegisterInfo registerInfo = useRegistrationService.getRegisterInfo(jgUseRegistration);
         List<Map<String, Object>> tableData;
-        if (CylinderTypeEnum.CYLINDER.getCode().equals(registerInfo.getEquCategory())) {
-            List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
-            Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
-            tableData = jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
-            tableData.forEach(i -> i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium"))));
-        } else {
+        if (EquipmentClassifityEnum.YLGD.getCode().equals(registerInfo.getEquList())){
             IdxBizJgProjectContraption idxBizJgProjectContraption = idxBizJgProjectContraptionService.getById(jgUseRegistration.getProjectContraptionId());
             Map<String, Object> map = IdxBizJgRegisterInfoServiceImpl.convertCamelToUnderscore(idxBizJgProjectContraption, IdxBizJgProjectContraptionServiceImpl.jsonFields);
             result.putAll(map);
             result.put("projectContraptionId", idxBizJgProjectContraption.getSequenceNbr());
             tableData = jgUseRegistrationMapper.queryForUnitPipelineEquipmentForEdit(records);
+        } else {
+            List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+            Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
+            tableData = jgUseRegistrationMapper.queryForUnitVesselEquipment(records);
+            tableData.forEach(i -> i.put("chargingMedium", fillingMediumMap.get(i.get("chargingMedium"))));
         }
         result.put("tableData", tableData);
         return result;

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

@@ -2400,6 +2400,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 for (int i = 0; i < equipmentLists.size(); i++) {
                     JSONObject equipmentItem = equipmentLists.getJSONObject(i);
                     equipmentItem.put("useDate", timeToMonths(useDateValue));
+                    // 过滤出目前在用的设备
+                    if(!this.checkEquStatusInUse(equipmentItem.getString("record"))){
+                        equipmentLists.remove(i);
+                    }
                 }
                 allEquipment.addAll(equipmentLists);
             }
@@ -2450,6 +2454,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
         return futureList;
     }
+
+    /**
+     * 根据record判断设备状态是否为【在用】
+     * @param record
+     * @return
+     */
+    private boolean checkEquStatusInUse(String record) {
+        IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.lambdaQuery().select(IdxBizJgUseInfo::getEquState).eq(IdxBizJgUseInfo::getRecord, record).one();
+        return EquimentEnum.ZAIYONG.getCode().toString().equals(useInfo.getEquState());
+    }
+
     /**
      * 导出基本信息汇总表(工业管道/气瓶)
      *