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