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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request foton-wkflow-group/foton-wkflow-rest!71
This commit is contained in:
王夏晖
2021-12-20 20:27:54 +08:00
parent 7d6111db6b 8da4f77a8f
commit f4fc34c80f
2 changed files with 14 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveAfter.java
+1 -36
View File
@@ -77,42 +77,7 @@ public class PEPmanagerApproveAfter implements TaskListener {
for (DataList da : dataList) { for (DataList da : dataList) {
PEPres pePres=new PEPres(); PEPres pePres=new PEPres();
List<PEPDTO> pepdtos=new ArrayList<>(); List<PEPDTO> pepdtos=new ArrayList<>();
for (SarStandProjectLibraries sa:da.getSarStandProjectLibraries()) { pepdtos.add(pepdto);
numberWithId.put(sa.getProjectNumber(),sa.getId());
for (BreakdownList breakdownList1:breakdownList) {
//造数据
//项目
PEPDTO res = new PEPDTO();
BeanUtils.copyProperties(pepdto, res);
List<DataList> dataLists = new ArrayList<>();
DataList dataList1 = new DataList();
List<SarStandProjectLibraries> list = new ArrayList<>();
SarStandProjectLibraries libraries = new SarStandProjectLibraries();
BeanUtils.copyProperties(sa, libraries);
res.setSarStandProjectLibraries(libraries);
list.add(sa);
dataList1.setSarStandProjectLibraries(list);
dataLists.add(dataList1);
res.setDataList(dataLists);
//标准 数据
BreakdownList breakdownList2 = new BreakdownList();
BeanUtils.copyProperties(breakdownList1, breakdownList2);
List<BreakdownList> breakdownLists = new ArrayList<>();
breakdownLists.add(breakdownList2);
res.setBreakdownList(breakdownLists);
res.setCertifiedEngineerName(object.getString("certifiedEngineerName"));
res.setQualityEngineerName(object.getString("qualityEngineerName"));
//存储终点数据
res.setDistributePerson(da.getDistributePerson());
res.setDistributePersonId(da.getDistributePersonId());
res.setUname(da.getUname());
res.setProjectManager(da.getProjectManager());
//时间
res.setXCXSSRQ(breakdownList1.getXcxssrq());
res.setZCCSSRQ(breakdownList1.getZccssrq());
pepdtos.add(res);
}
}
pePres.setPepdtos(pepdtos); pePres.setPepdtos(pepdtos);
map.put(da.getDistributePersonId(),pePres); map.put(da.getDistributePersonId(),pePres);
// 处理分发责任人 // 处理分发责任人
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+13 -13
View File
@@ -86,21 +86,21 @@ public class ResolveAfter implements TaskListener{
one1.setCreatUserName(username); one1.setCreatUserName(username);
busProcessNameService.saveOrUpdate(one1); busProcessNameService.saveOrUpdate(one1);
} }
// 存储当前节点意见 // // 存储当前节点意见
BusProcessNew busProcessNew = new BusProcessNew(); // BusProcessNew busProcessNew = new BusProcessNew();
busProcessNew.setMsgType("clause"); // busProcessNew.setMsgType("clause");
busProcessNew.setPId(delegateTask.getProcessInstanceId()); // busProcessNew.setPId(delegateTask.getProcessInstanceId());
busProcessNew.setMesg(object.toJSONString()); // busProcessNew.setMesg(object.toJSONString());
busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); // busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNew.setTaskId(delegateTask.getId()); // busProcessNew.setTaskId(delegateTask.getId());
busProcessNew.setCommitText(object.getString("commentText")); // busProcessNew.setCommitText(object.getString("commentText"));
busProcessNew.setFinishFlag("0"); // busProcessNew.setFinishFlag("0");
busProcessNew.setTaskInfo(delegateTask.getName()); // busProcessNew.setTaskInfo(delegateTask.getName());
busBean.save(busProcessNew); // busBean.save(busProcessNew);
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){ //2次 for(String nextUser : nextUserList){ //2次
List<JSONArrayVo> listRes = userGroupMap.get(nextUser); // List<JSONArrayVo> listRes = userGroupMap.get(nextUser);
object.put("itemList", JSON.toJSONString(listRes)); // object.put("itemList", JSON.toJSONString(listRes));
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause"); busProcessNewNext.setMsgType("clause");