Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
This commit is contained in:
+39
-10
@@ -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<SarStandardsInfo> 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(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(sarStandardsInfo.getId(), sarStandardsInfo.getStandType() + "_STAND", content);
|
||||
}
|
||||
}
|
||||
SarStandardsInfo sarStandardsInfo1 = sarStandardsInfoDao.selectBy1(id);
|
||||
if (sarStandardsInfo1 != null){
|
||||
String textStatus = "chblaarg77";
|
||||
sarStandardsInfo1.setTextStatus(textStatus);
|
||||
sarStandardsInfoDao.updateById(sarStandardsInfo1);
|
||||
|
||||
List<SarStandardsInfo> 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(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(sarStandardsInfo1.getId(), sarStandardsInfo1.getStandType() + "_STAND", content);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user