diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 48950bf4..897cd481 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -225,6 +225,7 @@ public class ActSarItemsBussEOService { String prcNum = String.valueOf(standMap.get("prcNum")); String pid = String.valueOf(standMap.get("topId")); String prcName = String.valueOf(standMap.get("prcName")); + String prcCreateUser = String.valueOf(standMap.get("prcCreateUser")); String standType = String.valueOf(standMap.get("standType")); // String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 SarBussionessStand sarBussionessStand = new SarBussionessStand(); @@ -316,7 +317,7 @@ public class ActSarItemsBussEOService { // 编辑相关流程 sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); String content = "新增一条相关流程:" +prcName+" "+prcNum; - sarUpdLogEOService.createBaseLog(sarBussionessStand.getId(),standType+"_STAND",content); + sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,prcCreateUser); }else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在,但是标准号存在的情况 String standId = lawsList.get(0).getId(); bussId = lawsList.get(0).getId(); @@ -348,9 +349,10 @@ public class ActSarItemsBussEOService { // 编辑相关流程 sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); String content = "新增一条相关流程:" +prcName+" "+prcNum; - sarUpdLogEOService.createBaseLog(standId,standType+"_STAND",content); + sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,prcCreateUser); } else {//标准号、ID都不存在的情况 // 新增方法 + sarBussionessStand.setPrcCreateUser(prcCreateUser); ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); if(responseMessage.isOk()){ SarBussionessStand bussionessStand = responseMessage.getData(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index f5b0b663..de095653 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -232,6 +232,8 @@ public class SarBussionessStand extends BaseEntity { private String issueTimeStart; @TableField(exist = false) private String issueTimeEnd; + @TableField(exist = false) + private String prcCreateUser; public static long getSerialVersionUID() { return serialVersionUID; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 8ba9a104..86d38baa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -231,7 +231,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl { void createBaseLog(String sarId, String sarType, String content) throws Exception; + void createBaseProcessLog(String sarId, String sarType, String content,String user) throws Exception; + void createUpdateLog(String sarType, String sarId, Map oldMap, Map newMap, String standContent) throws Exception; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java index 33a432fb..df23df2e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java @@ -266,4 +266,15 @@ public class SarUpdLogServiceImpl extends ServiceImpl i dao.insert(sarUpdLogEO); } + public void createBaseProcessLog (String sarId,String sarType,String content,String user) throws Exception { + SarUpdLog sarUpdLogEO = new SarUpdLog(); + sarUpdLogEO.setId(UUIDUtils.randomUUID20()); + sarUpdLogEO.setSarId(sarId); + sarUpdLogEO.setSarType(sarType); + sarUpdLogEO.setCreationTime(new Date()); + sarUpdLogEO.setCreationUser(StringUtils.isNotBlank(user) ? user : (LoginUserUtil.getUserId() == null ? "" : LoginUserUtil.getUserId())); + sarUpdLogEO.setContent(content); + dao.insert(sarUpdLogEO); + } + }