diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 2911e21d..66130526 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -229,5 +229,9 @@ public interface LawsUserInfoService { ResponseMessage selectOnlineFile(@RequestParam("onlineFileId") String onlineFileId,@RequestParam("standName") String standName,@RequestParam("key") String key); @GetMapping("lawss/sarBussionessStand/updateStandStatus") - ResponseMessage changeStandStatus(@RequestParam("standId") String standId,@RequestParam("standCode") String standCode,@RequestParam("standtextStatus") String standtextStatus); + ResponseMessage changeStandStatus(@RequestParam("standId") String standId, + @RequestParam("standCode") String standCode, + @RequestParam("standtextStatus") String standtextStatus, + @RequestParam("prcCreateUser") String prcCreateUser, + @RequestParam("prcNum") String prcNum); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java index 2d1f71bb..fae4caab 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java @@ -38,6 +38,9 @@ public class ProcessStep6After implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); //标准法规部业务经理Id ${sdFlag==0} bafzFlag List nextUserList = new ArrayList<>(); if ("0".equals(object.getString("bafzFlag"))){ @@ -55,9 +58,17 @@ public class ProcessStep6After implements TaskListener { // String as = JSONObject.toJSONString(bussAttrInfoMap); // sarBussionessStand.setSarStandAttrEOStr(as); // lawsUserInfoService.updateSarBussionessStand(sarBussionessStand); - + String prcNum = null; + if (one1 != null) { + prcNum = one1.getPrcNum(); + } // 变更标准状态 - ResponseMessage result = lawsUserInfoService.changeStandStatus(object.getString("standId"), object.getString("standCode"), object.getString("standtextStatus")); + ResponseMessage result = lawsUserInfoService.changeStandStatus( + object.getString("standId"), + object.getString("standCode"), + object.getString("standtextStatus"), + object.getString("prcCreateUser"), + prcNum); if(!result.getData()){ throw new ActivitiException("标准状态变更失败"); } @@ -77,9 +88,6 @@ public class ProcessStep6After implements TaskListener { prcName = "企标废止"; } String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { if ("0".equals(object.getString("bafzFlag"))){ one1.setOverTime(OVERTIME);