diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java index 8846f394..31f3cffa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java @@ -17,6 +17,7 @@ import org.activiti.engine.delegate.TaskListener; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; //确认 @@ -26,7 +27,6 @@ public class confirmAfter implements TaskListener { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService=SpringContextUtil.getBean(LawsUserInfoService.class); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -35,18 +35,13 @@ public class confirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - delegateTask.setVariable("approveId",object.getString("approveId")); - nextUserList.add(object.getString("approveId")); - List standProjectRelationDtos = new ArrayList<>(); -// JSONArray jsonArray=JSONArray.parseArray(object.getString("dataList")); -// for (Object os:jsonArray) { -// JSONObject jsonObject=JSONObject.parseObject(os.toString()); -// StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto(); -// standProjectRelationDto.setProjectId(object.getString("projectId")); -// standProjectRelationDto.setStandId(jsonObject.getString("id")); -// standProjectRelationDtos.add(standProjectRelationDto); -// } -// lawsUserInfoService.batchInsert(standProjectRelationDtos); + if (!object.getString("detailPeople").contains(",")){ + nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("detailPeople").split(",")))); + }else { + nextUserList.add(object.getString("detailPeople")); + } + delegateTask.setVariable("qrPeopleList",nextUserList); + //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = delegateTask.getVariable("startId",String.class); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java index c7a88b9b..58fc753e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateAfter.java @@ -57,7 +57,7 @@ public class PEPtaskEstimateAfter implements TaskListener { } String uuid = String.valueOf(UUID.randomUUID()); JSONArray ne=new JSONArray(); - BeanUtils.copyProperties(jsonArray,ne); + ne.addAll(jsonArray); delegateTask.setVariable(uuid, ne); jsonArray.removeAll(remove); object.put("dataList", jsonArray);