From 1fdc1935f41f9afe36c1962f31632f9a155ad191 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 27 Apr 2023 10:15:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BD=E5=86=85=E5=A4=96?= =?UTF-8?q?=E8=A2=AB=E4=BB=A3=E6=9B=BF=E6=B5=81=E7=A8=8B=E5=AD=98=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=8F=90=E7=A4=BA=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 16 +++++----- .../impl/SarStandardsInfoServiceImpl.java | 32 +++++++++---------- 2 files changed, 24 insertions(+), 24 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 56afb1a5..529cc085 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 @@ -207,16 +207,16 @@ public class ActSarItemsEOService { sarStandardsInfoDao.updateById(sarStandardsInfo); logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + 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"))){ 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); + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content); } } @@ -228,16 +228,16 @@ public class ActSarItemsEOService { sarStandardsInfoDao.updateById(sarStandardsInfo1); logger.info("原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"); - String content = "原标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成废止状态"; - sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content); + 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"))){ 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); + String content = "标准号："+ sarStandardsInfoEO.getReplaceStandNum() +"被代替标准号变更成被代替状态"; + sarUpdLogEOService.createBaseLog(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content); } } } 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 832fd761..26a9a230 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 @@ -425,16 +425,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl