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!83
This commit is contained in:
王夏晖
2021-12-29 11:31:12 +08:00
parent 00c89052f5 26f45780b7
commit 24d7b2cd85
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentAfter.java
+1
View File
@@ -32,6 +32,7 @@ public class PCAComplianceAssessmentAfter implements TaskListener {
//流程信息 //流程信息
IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
delegateTask.setVariable("GOGOGO","1");
//根据流程id找到流程信息 //根据流程id找到流程信息
QueryWrapper<Datas> queryWrapper = new QueryWrapper<>(); QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java
-1
View File
@@ -24,7 +24,6 @@ public class PCAComplianceAssessmentBefore implements TaskListener {
queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
if ("GO".equals(delegateTask.getVariable("GOGOGO"))) { if ("GO".equals(delegateTask.getVariable("GOGOGO"))) {
queryWrapper1.eq("TASK_ID", "GO"); queryWrapper1.eq("TASK_ID", "GO");
delegateTask.setVariable("GOGOGO","1");
}else { }else {
queryWrapper1.isNull("TASK_ID"); queryWrapper1.isNull("TASK_ID");
} }
src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java
+15 -13
View File
@@ -100,19 +100,21 @@ public class DeptApplayAfter implements TaskListener{
}); });
JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class)); JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
jsonArray1.forEach(obj ->{ if (null!=jsonArray1 && jsonArray1.size()>0) {
JSONObject object1 = JSONObject.parseObject(obj.toString()); jsonArray1.forEach(obj -> {
SarStandItems sarStandItems1=new SarStandItems(); JSONObject object1 = JSONObject.parseObject(obj.toString());
sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly",String.class)); SarStandItems sarStandItems1 = new SarStandItems();
sarStandItems1.setStandId(object.getString("standId")); sarStandItems1.setFileType(delegateTask.getVariable("fileTypeOnly", String.class));
sarStandItems1.setItemsNum(object1.getString("itemsNum")); sarStandItems1.setStandId(object.getString("standId"));
sarStandItems1.setItemsName(object1.getString("itemsName")); sarStandItems1.setItemsNum(object1.getString("itemsNum"));
sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow")); sarStandItems1.setItemsName(object1.getString("itemsName"));
sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName")); sarStandItems1.setResponsibleUnit(object1.getString("responsibleUnitShow"));
sarStandItems1.setTermsConditions(object1.getString("itermsConditions")); sarStandItems1.setDutyEngineer(object1.getString("zxUserIdName"));
sarStandItems1.setReadContent(object1.getString("technicalRequir")); sarStandItems1.setTermsConditions(object1.getString("itermsConditions"));
sarStandItems.add(sarStandItems1); sarStandItems1.setReadContent(object1.getString("technicalRequir"));
}); sarStandItems.add(sarStandItems1);
});
}
//标准状态修改 //标准状态修改
SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO(); SarFileSplitInfoEO sarFileSplitInfoEO=new SarFileSplitInfoEO();
sarFileSplitInfoEO.setSplitStatus("4"); sarFileSplitInfoEO.setSplitStatus("4");
src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java
+2 -4
View File
@@ -99,13 +99,11 @@ public class ResolveAfter implements TaskListener{
// 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");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
//busProcessNewNext.setMesg(StringEscapeUtils.unescapeJavaScript(object.toJSONString()));//返转义函数
busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setMesg(object.toJSONString());
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setFinishFlag("0");