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