From d04c9143e2adcb3201cd5aa1a1e95539ec1dcd01 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 26 Apr 2023 14:46:54 +0800 Subject: [PATCH] =?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年需要复审）。,其他为技术标准。（如遇新的产品标准编号规则应通知李经理补充。）） -- 详情