FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master

Browse Source
This commit is contained in:
zyd
2022-10-24 22:31:08 +08:00
parent 991c299c10 9e60b22671
commit 5a01009cf8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java
+6 -2
View File
@@ -132,7 +132,9 @@ public class ActSarItemsBussEOService {
String sarStandAttrInfo = JSONObject.toJSONString(attrInfoMap); String sarStandAttrInfo = JSONObject.toJSONString(attrInfoMap);
SarBussionessStand bussionessStand = new SarBussionessStand(); SarBussionessStand bussionessStand = new SarBussionessStand();
bussionessStand.setId(standId); bussionessStand.setId(standId);
bussionessStand.setTextStatusBuss(textStatus); if("2".equals(reviewResults) || "3".equals(reviewResults)) { // 废止，有效时才修改文本状态
bussionessStand.setTextStatusBuss(textStatus);
}
bussionessStand.setSarStandAttrEOStr(sarStandAttrInfo); bussionessStand.setSarStandAttrEOStr(sarStandAttrInfo);
iSarBussionessStandService.updateSarBussionessStand(bussionessStand); iSarBussionessStandService.updateSarBussionessStand(bussionessStand);
@@ -208,7 +210,9 @@ public class ActSarItemsBussEOService {
+"创建了《"+ esName +"》,其计划结果为复审"; +"创建了《"+ esName +"》,其计划结果为复审";
esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date)); esRevisePlanLogDao.insert(new EsRevisePlanLog(null,id,msg,date));
}else{ }else{
iEsRevisePlanService.addPlan(esRevisePlanDTO); if("1".equals(reviewResults)) { // 修订时才生成企标计划
iEsRevisePlanService.addPlan(esRevisePlanDTO);
}
} }
} }