diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index d1c97064..f89e7dcc 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -1031,9 +1031,6 @@ public class WorkFlowController { for (EsRevisePlan data : esRevisePlans){ //数据拼接 ProcessRollBackEO processRollBackEO = new ProcessRollBackEO(); - //起草人 - processRollBackEO.setUserId(data.getDrafter()); - processRollBackEO.setType("25"); //拼接json HashMap qbfsForm = new HashMap<>(); HashMap qbfsFormInfo = new HashMap<>(); @@ -1042,15 +1039,42 @@ public class WorkFlowController { qbfsForm.put("planStatus",data.getPlanStatus()); qbfsForm.put("reviseStatus",data.getReviseStatus()); qbfsForm.put("drafter",data.getDrafter()); - TsUser byIdDrafter = userService.getById(data.getDrafter()); - if(byIdDrafter!=null){ - qbfsForm.put("drafterName",byIdDrafter.getUname()); + + String drafterNameStr = ""; + if(StringUtils.isNotBlank(data.getDrafter())){ + String[] split = data.getDrafter().split(","); + List asList = Arrays.asList(split); + for (String uid:asList){ + TsUser byIdDrafterInfo = userService.getById(uid); + if(StringUtils.isBlank(drafterNameStr)){ + drafterNameStr = byIdDrafterInfo.getUname(); + }else { + drafterNameStr = drafterNameStr+","+byIdDrafterInfo.getUname(); + } + } } + if(StringUtils.isNotBlank(drafterNameStr)){ + qbfsForm.put("drafterName",drafterNameStr); + } + qbfsForm.put("resPerson",data.getResPerson()); - TsUser byIdResPrson = userService.getById(data.getResPerson()); - if(byIdResPrson!=null){ - qbfsForm.put("resPersonName",byIdResPrson.getUname()); + String resPersonNameStr = ""; + if(StringUtils.isNotBlank(data.getResPerson())){ + String[] split = data.getResPerson().split(","); + List asList = Arrays.asList(split); + for (String uid:asList){ + TsUser byIdDrafterInfo = userService.getById(uid); + if(StringUtils.isBlank(resPersonNameStr)){ + resPersonNameStr = byIdDrafterInfo.getUname(); + }else { + resPersonNameStr = resPersonNameStr+","+byIdDrafterInfo.getUname(); + } + } } + if(StringUtils.isNotBlank(drafterNameStr)){ + qbfsForm.put("resPersonName",resPersonNameStr); + } + String wgLeaderStr = data.getWgLeader(); if(wgLeaderStr!=null){ if(wgLeaderStr.endsWith(",")){ @@ -1058,10 +1082,23 @@ public class WorkFlowController { } } qbfsForm.put("wgLeader",wgLeaderStr); - qbfsForm.put("resPerson",data.getResPerson()); - TsUser byIdWgleader = userService.getById(data.getResPerson()); - if(byIdWgleader!=null){ - qbfsForm.put("wgLeaderName",byIdWgleader.getUname()); + + String wgLeaderNameStr = ""; + if(StringUtils.isNotBlank(data.getWgLeader())){ + String[] split = data.getWgLeader().split(","); + List asList = Arrays.asList(split); + for (String uid : asList){ + TsUser byIdWgleader = userService.getById(uid); + if(StringUtils.isBlank(wgLeaderNameStr)){ + wgLeaderNameStr = byIdWgleader.getUname(); + }else { + wgLeaderNameStr = wgLeaderNameStr+","+byIdWgleader.getUname(); + } + } + } + + if(StringUtils.isNotBlank(wgLeaderNameStr)){ + qbfsForm.put("wgLeaderName",wgLeaderNameStr); } qbfsForm.put("standId",data.getStandId()); @@ -1090,9 +1127,22 @@ public class WorkFlowController { qbfsForm.put("esStandRelations",data.getEsStandRelations()); qbfsForm.put("isRelate",data.getIsRelate()); qbfsForm.put("useLevel",data.getUseLevel()); - TsUser byIdUseLevel = userService.getById(data.getUseLevel()); - if(byIdUseLevel!=null){ - qbfsForm.put("useLevelName",data.getUseLevelName()); + + String useLevelNameStr = ""; + if(StringUtils.isNotBlank(data.getUseLevel())){ + String[] split = data.getUseLevel().split(","); + List asList = Arrays.asList(split); + for (String uid: asList){ + TsUser byIdUseLevel = userService.getById(uid); + if(StringUtils.isBlank(useLevelNameStr)){ + useLevelNameStr = byIdUseLevel.getUname(); + }else { + useLevelNameStr = useLevelNameStr+","+byIdUseLevel.getUname(); + } + } + } + if(StringUtils.isNotBlank(useLevelNameStr)){ + qbfsForm.put("useLevelName",useLevelNameStr); } qbfsForm.put("technologic",data.getTechnologic()); @@ -1102,30 +1152,54 @@ public class WorkFlowController { qbfsForm.put("LXD",data.getLxd()); qbfsForm.put("LXDName",""); qbfsForm.put("addFlag","1"); - qbfsForm.put("prcCreateUser",data.getDrafter()); - TsUser byIdDrafterInfo = userService.getById(data.getDrafter()); - if(byIdDrafterInfo!=null){ - qbfsForm.put("prcCreateUserName",byIdDrafterInfo.getUname()); - } + + +// String prcCreateUserNameStr = ""; +// if(StringUtils.isNotBlank(data.getDrafter())){ +// String[] split = data.getDrafter().split(","); +// List asList = Arrays.asList(split); +// for (String uid:asList){ +// TsUser byIdDrafterInfo = userService.getById(uid); +// if(StringUtils.isBlank(prcCreateUserNameStr)){ +// prcCreateUserNameStr = byIdDrafterInfo.getUname(); +// }else { +// prcCreateUserNameStr = prcCreateUserNameStr+","+byIdDrafterInfo.getUname(); +// } +// } +// } + qbfsForm.put("nowEsId","操作成功"); qbfsForm.put("type","5"); - String jsonMap = JSONObject.toJSONString(qbfsForm); - qbfsFormInfo.put("qbfsForm",qbfsForm); - processRollBackEO.setJson(JSONObject.toJSONString(qbfsFormInfo)); - ResponseMessage responseMessage = startProcessRollBack(processRollBackEO); - if(responseMessage!=null){ - String taskId = responseMessage.getData().toString(); - BusMes busMes = new BusMes(); - busMes.setPrcType("25"); - busMes.setTaskIds(taskId); -// busMes.setCreateUserName(userName); + if(StringUtils.isNotBlank(data.getDrafter())){ + String[] split = data.getDrafter().split(","); + List asList = Arrays.asList(split); + TsUser byIdUseLevel = userService.getById(asList.get(0)); + qbfsForm.put("prcCreateUser",asList.get(0)); + qbfsForm.put("prcCreateUserName",byIdUseLevel.getUname()); + + // if(jsonObject.get("prcCreateUser")!=null){ // busMes.setUserId(jsonObject.get("prcCreateUser").toString()); // } - busMes.setCreateUserName(data.getDrafterName()); - busMes.setUserId(data.getDrafter()); - busMes.setJson(jsonMap); - Wrapper stringWrapper = completeTaskByUserId(busMes); + //起草人 + processRollBackEO.setUserId(asList.get(0)); + processRollBackEO.setType("25"); + String jsonMap = JSONObject.toJSONString(qbfsForm); + qbfsFormInfo.put("qbfsForm",qbfsForm); + processRollBackEO.setJson(JSONObject.toJSONString(qbfsFormInfo)); + ResponseMessage responseMessage = startProcessRollBack(processRollBackEO); + if(responseMessage!=null){ + String taskId = responseMessage.getData().toString(); + BusMes busMes = new BusMes(); + busMes.setCreateUserName(byIdUseLevel.getUname()); + busMes.setPrcType("25"); + busMes.setTaskIds(taskId); + busMes.setCreateUserName(byIdUseLevel.getUname()); + busMes.setUserId(asList.get(0)); + busMes.setJson(jsonMap); + Wrapper stringWrapper = completeTaskByUserId(busMes); + } + } } return Result.success();