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
This commit is contained in:
super_liu
2022-03-21 15:08:39 +08:00
parent a08f74e3fb f6ddf25a00
commit 7761fa4687
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
+9 -1
View File
@@ -88,8 +88,16 @@ public class TaskController {
queryWrapper.eq("PRC_NUM",prcNum); queryWrapper.eq("PRC_NUM",prcNum);
BusProcessName one = iBusProcessNameService.getOne(queryWrapper); BusProcessName one = iBusProcessNameService.getOne(queryWrapper);
HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(one.getPrcId()).orderByTaskCreateTime().asc(); .processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
List<HistoricTaskInstance> list2 = historicTaskInstanceQuery.list(); List<HistoricTaskInstance> list2 = historicTaskInstanceQuery.list();
List<HistoricTaskInstance> middle =new ArrayList<>();
list2.forEach(historicTaskInstance -> {
if (null==historicTaskInstance.getEndTime()){
middle.add(historicTaskInstance);
}
});
list2.removeAll(middle);
list2.addAll(middle);
List<Map<String,Object>> list = ActivitiTools.turnHistoricTaskInstance(list2); List<Map<String,Object>> list = ActivitiTools.turnHistoricTaskInstance(list2);
for (Map<String, Object> historicTaskInstance : list) { for (Map<String, Object> historicTaskInstance : list) {
// if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) { // if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) {
src/main/java/com/ydw/bat/wkflow/listener/xmhgpgXM/Step5After.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class Step5After implements TaskListener {
sarStandUnqualified.setProductLine(object.getString("productLine")); sarStandUnqualified.setProductLine(object.getString("productLine"));
sarStandUnqualified.setProductId(object.getString("projectNumber")); sarStandUnqualified.setProductId(object.getString("projectNumber"));
sarStandUnqualified.setItemsNum(jsonObject.getString("itemsNum")); sarStandUnqualified.setItemsNum(jsonObject.getString("itemsNum"));
sarStandUnqualified.setStandName(jsonObject.getString("itemsName")); sarStandUnqualified.setItemsName(jsonObject.getString("itemsName"));
standUnqualifieds.add(sarStandUnqualified); standUnqualifieds.add(sarStandUnqualified);
} }
if (null!=jsonObject.getString("remarks") || null!=jsonObject.getString("complianceReasons") || null!= jsonObject.getString("noCompliance")) { if (null!=jsonObject.getString("remarks") || null!=jsonObject.getString("complianceReasons") || null!= jsonObject.getString("noCompliance")) {