From bd929c85eba906dbd6b89d2dd654707b2214d237 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 10 May 2023 16:43:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E6=89=B9=E9=87=8F=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=92=8C=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7=20?= =?UTF-8?q?=E8=A2=AB=E4=BB=A3=E6=9B=BF=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=AD=E6=A0=A1=E9=AA=8C=E5=8F=91=E5=B8=83=E5=92=8C=E5=8D=B3?= =?UTF-8?q?=E5=B0=86=E5=AE=9E=E6=96=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 4 +- .../impl/SarStandardsInfoServiceImpl.java | 95 +------------------ 2 files changed, 7 insertions(+), 92 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 529cc085..3edb7781 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -209,7 +209,7 @@ public class ActSarItemsEOService { String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; sarUpdLogEOService.createBaseLog(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content); - }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c") || sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ String textStatus = "qke0ckro2p"; sarStandardsInfo.setTextStatus(textStatus); sarStandardsInfoDao.updateById(sarStandardsInfo); @@ -230,7 +230,7 @@ public class ActSarItemsEOService { String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; sarUpdLogEOService.createBaseLog(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content); - }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c") || sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ String textStatus = "qke0ckro2p"; sarStandardsInfo1.setTextStatus(textStatus); sarStandardsInfoDao.updateById(sarStandardsInfo1); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 0a26fff4..a75d9553 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -320,91 +320,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); -// wrapper.isNotNull("DTBJH"); -// wrapper.ne("DTBJH", ""); -// wrapper.eq("valid_flag", "0"); -//// wrapper.eq("stand_id", "6zaj8lx8s9ebc3za0g95"); -// List sarStandAttrInfos = sarStandAttrInfoEODao.selectList(wrapper); -// if (null != sarStandAttrInfos && !sarStandAttrInfos.isEmpty()) { -// //获取数据以及更新自身 新查询当前标准数据并将格式化之后的数据更新到代替标准号中 -// int i = 1; -// for (SarStandAttrInfo sarStandAttrInfo : sarStandAttrInfos) { -// String dtbzh = convertStandCodeHandle(sarStandAttrInfo.getDtbjh()); -// logger.info("第" + i + "行数据代替标准号为" + dtbzh + "转换前标准号为" + sarStandAttrInfo.getDtbjh()); -// logger.info("第" + i + "行数据为" + sarStandAttrInfo.toString()); -// QueryWrapper wrapper2 = new QueryWrapper<>(); -// wrapper2.eq("valid_flag", "0"); -// wrapper2.eq("stand_id", sarStandAttrInfo.getStandId()); -// List attrInfoList = sarStandAttrInfoEODao.selectList(wrapper2); -// attrInfoList.get(0).setDtbjh(dtbzh); -// sarStandAttrInfoEODao.update(attrInfoList.get(0), wrapper2); -// -// -// //找到用来代替的标准号 -// SearchStandContext searchStandContext1 = new SearchStandContext(); -// searchStandContext1.setStandId(sarStandAttrInfo.getStandId()); -// List list1 = standDataDao.searchStandDataThree(searchStandContext1); -// if (null != list1 && list1.size() > 0) { -// String bdtbzh = list1.get(0).getStandNum(); -// -// //现在针对处理一波代替标准号 根据标准号找到 -// if (dtbzh.contains(",") && !dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT") &&null!=bdtbzh && !bdtbzh.contains("null")) { -// //判定是不是多个 -// List strings = new ArrayList<>(Arrays.asList(dtbzh.split(","))); -// strings.forEach(s -> { -// if (StringUtils.isNotBlank(s)) { -// SearchStandContext searchStandContext = new SearchStandContext(); -// searchStandContext.setStandCode(s); -// List list = standDataDao.searchStandDataThree(searchStandContext); -// if (null != list && list.size() > 0) { -// QueryWrapper wrapper1 = new QueryWrapper<>(); -// wrapper1.eq("valid_flag", "0"); -// wrapper1.eq("stand_id", list.get(0).getStandId()); -// List attrInfos = sarStandAttrInfoEODao.selectList(wrapper1); -// if (null != attrInfos && attrInfos.size() > 0) { -// if (null != attrInfos.get(0).getBdtbzh() && !"".equals(attrInfos.get(0).getBdtbzh())) { -// if (!attrInfos.get(0).getBdtbzh().contains(bdtbzh)) { -// attrInfos.get(0).setBdtbzh(attrInfos.get(0).getBdtbzh() + "," + bdtbzh); -// } -// } else { -// attrInfos.get(0).setBdtbzh(bdtbzh); -// } -// sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1); -// } -// } -// } -// }); -// -// } else if (!dtbzh.isEmpty() && !"".equals(dtbzh) && !dtbzh.contains("null") && !dtbzh.contains("Q/FT") &&null!=bdtbzh && !bdtbzh.contains("null")) { -// //单个 -// SearchStandContext searchStandContext = new SearchStandContext(); -// searchStandContext.setStandCode(dtbzh); -// List list = standDataDao.searchStandDataThree(searchStandContext); -// if (null != list && list.size() > 0) { -// QueryWrapper wrapper1 = new QueryWrapper<>(); -// wrapper1.eq("valid_flag", "0"); -// wrapper1.eq("stand_id", list.get(0).getStandId()); -// List attrInfos = sarStandAttrInfoEODao.selectList(wrapper1); -// if (null != attrInfos && attrInfos.size() > 0) { -// if (null != attrInfos.get(0).getBdtbzh() && !"".equals(attrInfos.get(0).getBdtbzh())) { -// if (!attrInfos.get(0).getBdtbzh().contains(bdtbzh)) { -// attrInfos.get(0).setBdtbzh(attrInfos.get(0).getBdtbzh() + "," + bdtbzh); -// } -// } else { -// attrInfos.get(0).setBdtbzh(bdtbzh); -// } -// sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1); -// } -// } -// } -// i++; -// } -// } -// } - List sarStandardsInfoEOs = dao.getSarStandardsInfo(); if (ObjectUtils.isNotEmpty(sarStandardsInfoEOs) && sarStandardsInfoEOs != null) { for (SarStandardsInfo sarStandardsInfoEO : sarStandardsInfoEOs) { @@ -428,7 +343,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarStandardsInfos = dao.selectBy(id); - if (ObjectUtils.isNotEmpty(sarStandardsInfos) && sarStandardsInfos != null){ + if (ObjectUtils.isNotEmpty(sarStandardsInfos) && sarStandardsInfos != null){ for (SarStandardsInfo sarStandardsInfo:sarStandardsInfos){ if (sarStandardsInfo != null && sarStandardsInfo.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ String textStatus = "chblaarg77"; @@ -1407,7 +1322,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl