From d04c9143e2adcb3201cd5aa1a1e95539ec1dcd01 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 26 Apr 2023 14:46:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E5=85=A5=E5=BA=93=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=AF=B9=E4=BB=A3=E6=9B=BF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E6=89=80=E5=AF=B9=E5=BA=94=E8=80=81=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=20?= =?UTF-8?q?=E5=92=8C=E6=89=B9=E9=87=8F=E8=B7=91=E6=9B=BF=E6=8D=A2=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E6=A0=87=E5=87=86=E5=8F=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 49 +++++++++++++++---- .../dao/SarStandardsInfoDao.java | 4 +- .../impl/SarStandardsInfoServiceImpl.java | 49 +++++++++++++++---- .../SarStandardsInfoMapper.xml | 8 +-- .../src/main/resources/mysql/interfaceLog.sql | 9 ++++ 5 files changed, 93 insertions(+), 26 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 32f4d761..d1fdb44c 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 @@ -199,17 +199,46 @@ public class ActSarItemsEOService { if (org.apache.commons.lang3.StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){ sarStandardsInfoDao.updateById(sarStandardsInfoEO); String id = sarStandardsInfoEO.getStandName(); - SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectBy(id); - if (sarStandardsInfo != null){ - String textStatus = "chblaarg77"; - sarStandardsInfo.setTextStatus(textStatus); - sarStandardsInfoDao.updateById(sarStandardsInfo); + List sarStandardsInfos = sarStandardsInfoDao.selectBy(id); + 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"; + sarStandardsInfo.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + } } - SarStandardsInfo sarStandardsInfo1 = sarStandardsInfoDao.selectBy1(id); - if (sarStandardsInfo1 != null){ - String textStatus = "chblaarg77"; - sarStandardsInfo1.setTextStatus(textStatus); - sarStandardsInfoDao.updateById(sarStandardsInfo1); + + List sarStandardsInfo1s = sarStandardsInfoDao.selectBy1(id); + for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){ + if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo1.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index c2488196..1254004e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -119,8 +119,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO); - SarStandardsInfo selectBy(String id); + List selectBy(String id); - SarStandardsInfo selectBy1(String id); + List selectBy1(String id); } 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 d7cdb6ec..a1d8ef6f 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 @@ -1333,17 +1333,46 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarStandardsInfos = dao.selectBy(id); + 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"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + } } - SarStandardsInfo sarStandardsInfo1 = dao.selectBy1(id); - if (sarStandardsInfo1 != null){ - String textStatus = "chblaarg77"; - sarStandardsInfo1.setTextStatus(textStatus); - dao.updateById(sarStandardsInfo1); + + List sarStandardsInfo1s = dao.selectBy1(id); + for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){ + if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + } } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 326dad79..ab9dd7f0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -2041,7 +2041,7 @@ diff --git a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql index 49bf82e3..1d54c770 100644 --- a/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql +++ b/adc-da-slrs/src/main/resources/mysql/interfaceLog.sql @@ -1,5 +1,14 @@ -- 福田 需要通过第三方调用的接口 +--2023-04-26 11:18 +--名称 国内海外数据处理接口 处理 代替被代替数据 关系 +--详情 +--路径 http://localhost:9090/api/sarStandardsInfo/sar-standards-info/replaceBdtbzhforDtbzh +--参数 +--类型 Get + + + -- 2023-04-23 11:18 -- 名称 纠正企业标准复审日期的数据 -Q/QCBFC -Q/FT X产品标准（发布日期和复审日期留一个（逻辑：产品标准经过3年需要复审，技术标准经过5年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。）） -- 详情 From 4d627eedbbd38eceedeb910c11adafcbd4251651 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 26 Apr 2023 14:57:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E5=85=A5=E5=BA=93=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=AF=B9=E4=BB=A3=E6=9B=BF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E6=89=80=E5=AF=B9=E5=BA=94=E8=80=81=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/workFlow/service/ActSarItemsEOService.java | 4 ++-- .../service/impl/SarStandardsInfoServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 d1fdb44c..56afb1a5 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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); - }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c"))){ + }else if (sarStandardsInfo != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c") || 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(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); - }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c"))){ + }else if (sarStandardsInfo1 != null && (sarStandardsInfoEO.getTextStatus().equals("hb0iy9z23c") || sarStandardsInfoEO.getTextStatus().equals("hc99551723c") || 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 a1d8ef6f..c3ce2146 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 @@ -1343,7 +1343,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl Date: Wed, 26 Apr 2023 16:46:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E5=85=A5=E5=BA=93=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=AF=B9=E4=BB=A3=E6=9B=BF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E6=89=80=E5=AF=B9=E5=BA=94=E8=80=81=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=20=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 2 +- .../dao/SarStandardsInfoDao.java | 3 + .../service/ISarStandardsInfoService.java | 2 +- .../impl/SarStandardsInfoServiceImpl.java | 299 ++++++++++++------ .../SarStandardsInfoMapper.xml | 4 +- 5 files changed, 204 insertions(+), 106 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 6479d29b..9e22faf1 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -920,7 +920,7 @@ public class SarStandardsInfoController extends BaseController //处理 代替被代替数据 关系 @ApiOperation(value = "国内海外数据处理接口") @GetMapping("/replaceBdtbzhforDtbzh") - public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo) { + public String replaceBdtbzhforDtbzh(SarStandardsInfo sarStandardsInfo)throws Exception { sarStandardsInfoEOService.replaceBdtbzhforDtbzh(); return "1"; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 1254004e..2658b99d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -122,5 +122,8 @@ public interface SarStandardsInfoDao extends BaseMapper { List selectBy(String id); List selectBy1(String id); + + @Select("select * from SAR_STANDARDS_INFO where VALID_FLAG = 0") + List getSarStandardsInfo(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 5f6129cd..e32b952c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -65,7 +65,7 @@ public interface ISarStandardsInfoService extends IService { void updateIntoIndexForMap(Map attrInfoMap); - void replaceBdtbzhforDtbzh(); + void replaceBdtbzhforDtbzh() throws Exception; void replaceBdtbzhforDtbzhQb(); 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 c3ce2146..badd3f9d 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 @@ -318,92 +318,182 @@ 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); +// QueryWrapper 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) { + if (sarStandardsInfoEO != null && ObjectUtils.isNotEmpty(sarStandardsInfoEO)) { - //找到用来代替的标准号 - 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(); + //createStandAttrInfo(sarStandardsInfoEO,true); - //现在针对处理一波代替标准号 根据标准号找到 - 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); - } + String sarStandAttrEOStr = sarStandardsInfoEO.getSarStandAttrEOStr(); + // 将字符串转为map进行解析 + Map sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + for (Map.Entry entry : sarStandAttrMap.entrySet()) { + String attrKey = entry.getKey(); + String attrValue = String.valueOf(entry.getValue()); + if (InitStandAttrUtil.queryFieldList != null && !InitStandAttrUtil.queryFieldList.isEmpty()) { + if (InitStandAttrUtil.queryFieldList.contains(attrKey)) { + if ("YYBJ".equals(attrKey)) { + sarStandardsInfoEO.setCiteStand(attrValue); + } else if ("CBBH".equals(attrKey)) { + sarStandardsInfoEO.setRelateStand(attrValue); + } else if ("DTBJH".equals(attrKey)) { + sarStandardsInfoEO.setReplaceStandNum(attrValue); + } else if ("BFDTBZ".equals(attrKey)) { + sarStandardsInfoEO.setReplacePartStandNum(attrValue); } - } - }); - - } 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); + // 不同类型存储数据需单独处理值 + if (InitStandAttrUtil.numFieldList.contains(attrKey)) { + if (StringUtils.isBlank(attrValue)) { + attrValue = "null"; } + } else if (InitStandAttrUtil.timeFieldList.contains(attrKey)) { + attrValue = FieldConvertUtil.changeTimeValue(attrValue); } else { - attrInfos.get(0).setBdtbzh(bdtbzh); + attrValue = "'" + attrValue + "'"; + } + } + } + } + if (StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){ + dao.updateById(sarStandardsInfoEO); + String id = sarStandardsInfoEO.getId(); + List sarStandardsInfos = dao.selectBy(id); + 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"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + } + } + } + + + List sarStandardsInfo1s = dao.selectBy1(id); + if (ObjectUtils.isNotEmpty(sarStandardsInfo1s) && sarStandardsInfo1s != null){ + for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){ + if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); } - sarStandAttrInfoEODao.update(attrInfos.get(0), wrapper1); } } } - i++; } } } - } @Override @@ -1332,46 +1422,51 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarStandardsInfos = dao.selectBy(id); - 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"; - sarStandardsInfo.setTextStatus(textStatus); - dao.updateById(sarStandardsInfo); - logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + 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"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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"))){ - String textStatus = "qke0ckro2p"; - sarStandardsInfo.setTextStatus(textStatus); - dao.updateById(sarStandardsInfo); - logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + } } } + List sarStandardsInfo1s = dao.selectBy1(id); - for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){ - if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ - String textStatus = "chblaarg77"; - sarStandardsInfo1.setTextStatus(textStatus); - dao.updateById(sarStandardsInfo1); - logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); + if (ObjectUtils.isNotEmpty(sarStandardsInfo1s) && sarStandardsInfo1s != null){ + for (SarStandardsInfo sarStandardsInfo1 : sarStandardsInfo1s){ + if (sarStandardsInfo1 != null && sarStandardsInfo1.getStandSort().equals("GB") && (sarStandardsInfoEO.getTextStatus().equals("vsaga7nwub") || sarStandardsInfoEO.getTextStatus().equals("chblaarg77") || sarStandardsInfoEO.getTextStatus().equals("qke0ckro2p"))){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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"))){ - String textStatus = "qke0ckro2p"; - sarStandardsInfo1.setTextStatus(textStatus); - dao.updateById(sarStandardsInfo1); - logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.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"))){ + String textStatus = "qke0ckro2p"; + sarStandardsInfo1.setTextStatus(textStatus); + dao.updateById(sarStandardsInfo1); + logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + } } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index ab9dd7f0..afcfda21 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -2052,7 +2052,7 @@ ssi.REPLACE_STAND_NUM = concat(ssi2.STAND_SORT,' ',ssi2.STAND_NUMBER) - and ssi.STAND_NAME = #{id} and ssi.VALID_FLAG = 0 + and ssi.id = #{id} and ssi.VALID_FLAG = 0