Commit 7b4736fd authored by tianbo's avatar tianbo

feat(jg): 报废业务增加工业管道

parent 721e118d
...@@ -329,7 +329,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -329,7 +329,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
List<Map<String, Object>> list = (List<Map<String, Object>>) noticeParams.get("equipments"); List<Map<String, Object>> list = (List<Map<String, Object>>) noticeParams.get("equipments");
for (Map<String, Object> equip : list) { for (Map<String, Object> equip : list) {
JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq(); JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
jgScrapCancelEq.setEquId(equip.get("SEQUENCE_NBR").toString()); jgScrapCancelEq.setEquId(MapUtil.getStr(equip, this.getRecordKey(equListCode)));
JgScrapCancelEqList.add(jgScrapCancelEq); JgScrapCancelEqList.add(jgScrapCancelEq);
} }
} else { } else {
...@@ -352,6 +352,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -352,6 +352,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
return JgScrapCancelEqList; return JgScrapCancelEqList;
} }
private String getRecordKey(String equListCode) {
if (!EquipmentClassifityEnum.YLGD.getCode().equals(equListCode)) {
return "SEQUENCE_NBR";
} else {
return "record";
}
}
private void repeatUsedCertificationCheck(List<JgScrapCancelEq> eqList, String companyCode) { private void repeatUsedCertificationCheck(List<JgScrapCancelEq> eqList, String companyCode) {
eqList.forEach(cancelEq -> EquipUsedCheckStrategyContext.getUsedStrategy(PAGE_KEY) eqList.forEach(cancelEq -> EquipUsedCheckStrategyContext.getUsedStrategy(PAGE_KEY)
.registrationRepeatUsedCheck(cancelEq.getEquId(), companyCode)); .registrationRepeatUsedCheck(cancelEq.getEquId(), companyCode));
...@@ -391,7 +399,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -391,7 +399,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
private void setUseRegisterInfo(JgScrapCancel jgScrapCancel, Map<String, Object> noticeParams) { private void setUseRegisterInfo(JgScrapCancel jgScrapCancel, Map<String, Object> noticeParams) {
// 判断是否是报废气瓶业务处理 // 判断是否是报废气瓶业务处理
if ((CancelTypeEnum.SCRAPPED.getCode().equals(noticeParams.get("cancelType")) && if ((CancelTypeEnum.SCRAPPED.getCode().equals(noticeParams.get("cancelType")) &&
CylinderTypeEnum.CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) || EquipmentClassifityEnum.YLGD.getCode().equals(noticeParams.get("equListCode"))) { CylinderTypeEnum.CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE")))) {
// 证ids // 证ids
List<String> certificates = (List<String>) noticeParams.get("sequenceNbrs"); List<String> certificates = (List<String>) noticeParams.get("sequenceNbrs");
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
...@@ -400,6 +408,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -400,6 +408,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
List<JgUseRegistrationManage> jgUseRegistrationManageList = jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper); List<JgUseRegistrationManage> jgUseRegistrationManageList = jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
jgScrapCancel.setRegistrationManageId(String.join(",", certificates)); jgScrapCancel.setRegistrationManageId(String.join(",", certificates));
jgScrapCancel.setUseRegistrationCode(jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.joining(","))); jgScrapCancel.setUseRegistrationCode(jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.joining(",")));
} else if (EquipmentClassifityEnum.YLGD.getCode().equals(noticeParams.get("equListCode"))) {
String useRegistrationCode = MapUtil.getStr(noticeParams, "useRegistrationCode");
LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCode);
lambdaQueryWrapper.select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getUseRegistrationCode);
List<JgUseRegistrationManage> jgUseRegistrationManageList = jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
jgScrapCancel.setRegistrationManageId(jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getSequenceNbr).map(String::valueOf).collect(Collectors.joining(",")));
jgScrapCancel.setUseRegistrationCode(jgUseRegistrationManageList.stream().map(JgUseRegistrationManage::getUseRegistrationCode).collect(Collectors.joining(",")));
} else { } else {
List<Map<String, Object>> certificates; List<Map<String, Object>> certificates;
// 证列表 // 证列表
...@@ -424,7 +440,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -424,7 +440,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
List<JgScrapCancelEq> JgScrapCancelEqList = new ArrayList<>(); List<JgScrapCancelEq> JgScrapCancelEqList = new ArrayList<>();
// 判断是否是报废气瓶业务处理 // 判断是否是报废气瓶业务处理
if ((CancelTypeEnum.SCRAPPED.getCode().equals(noticeParams.get("cancelType")) && if ((CancelTypeEnum.SCRAPPED.getCode().equals(noticeParams.get("cancelType")) &&
CylinderTypeEnum.CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE"))) || EquipmentClassifityEnum.YLRQ.getCode().equals(noticeParams.get("EQU_LIST_CODE"))) { CylinderTypeEnum.CYLINDER.getCode().equals(noticeParams.get("EQU_CATEGORY_CODE")))) {
List<Map<String, Object>> list = (List<Map<String, Object>>) noticeParams.get("equipments"); List<Map<String, Object>> list = (List<Map<String, Object>>) noticeParams.get("equipments");
for (Map<String, Object> equip : list) { for (Map<String, Object> equip : list) {
JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq(); JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
...@@ -434,6 +450,16 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -434,6 +450,16 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancelEq.setEquCode(equip.get("EQU_CODE") != null ? equip.get("EQU_CODE").toString() : ""); jgScrapCancelEq.setEquCode(equip.get("EQU_CODE") != null ? equip.get("EQU_CODE").toString() : "");
JgScrapCancelEqList.add(jgScrapCancelEq); JgScrapCancelEqList.add(jgScrapCancelEq);
} }
} else if (EquipmentClassifityEnum.YLGD.getCode().equals(noticeParams.get("equListCode"))) {
List<Map<String, Object>> list = (List<Map<String, Object>>) noticeParams.get("equipments");
for (Map<String, Object> equip : list) {
JgScrapCancelEq jgScrapCancelEq = new JgScrapCancelEq();
jgScrapCancelEq.setEquId(MapUtil.getStr(equip, "record"));
jgScrapCancelEq.setUseRegistrationCode(MapUtil.getStr(equip, "useOrgCode"));
jgScrapCancelEq.setEquipTransferId(String.valueOf(jgScrapCancel.getSequenceNbr()));
jgScrapCancelEq.setEquCode(MapUtil.getStr(equip, "equCode"));
JgScrapCancelEqList.add(jgScrapCancelEq);
}
} else { } else {
List<Map<String, Object>> certificates; List<Map<String, Object>> certificates;
// 证列表 // 证列表
...@@ -807,6 +833,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -807,6 +833,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
beanMap.put("equipments", JSONArray.parse(jsonObject.get("equipments").toString())); beanMap.put("equipments", JSONArray.parse(jsonObject.get("equipments").toString()));
beanMap.put("EQU_CATEGORY_CODE", CylinderTypeEnum.CYLINDER.getCode()); beanMap.put("EQU_CATEGORY_CODE", CylinderTypeEnum.CYLINDER.getCode());
beanMap.put("sequenceNbrs", jsonObject.get("sequenceNbrs")); beanMap.put("sequenceNbrs", jsonObject.get("sequenceNbrs"));
} else if (EquipmentClassifityEnum.YLGD.getCode().equals(jsonObject.get("equListCode"))) {
beanMap.put("projectContraptionNo", jsonObject.get("projectContraptionNo").toString());
beanMap.put("equipments", JSONArray.parse(jsonObject.get("equipments").toString()));
} else { } else {
beanMap.put("certificates", JSONArray.parse(jsonObject.get("certificates").toString())); beanMap.put("certificates", JSONArray.parse(jsonObject.get("certificates").toString()));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment