[修改] 查看审批历史 转办部分

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java

@@ -74,6 +74,8 @@ public class TaskController {
 				.processInstanceId(one.getPrcId()).orderByTaskCreateTime().asc();
 		List<HistoricTaskInstance> list2 = historicTaskInstanceQuery.list();
 		List<Map<String,Object>> list = ActivitiTools.turnHistoricTaskInstance(list2);
+		List<Map<String, Object>> relistMap = new ArrayList<>();
+
 		for (Map<String, Object> historicTaskInstance : list) {
 			// 获取办理的历史信息
 			if(historicTaskInstance.get("assignee") == null) {
@@ -102,11 +104,37 @@ public class TaskController {
 					QueryWrapper queryWrapper2 = new QueryWrapper();
 					queryWrapper2.eq("TASK_ID",historicTaskInstance.get("id"));
 					queryWrapper2.orderByAsc("CREATE_TIME");
-					List<BusProcessEntrust> list1 = iBusProcessEntrustService.list(queryWrapper2);
+					List<BusProcessEntrust> EOS = iBusProcessEntrustService.list(queryWrapper2);
-					String str = "";
+					//委托人
-					if(list1.size()>0){
+					if(EOS.size()>0){
-						UserEO assigneenActual = userEoService.getUserById(list1.get(0).getUserId());
+						for (int i = 0; i < EOS.size(); i++) {
-						historicTaskInstance.put("assignee", assignee.getUsname()+"(" + assigneenActual.getUsname() + " 委托)");
+							BusProcessEntrust busProcessEntrust = EOS.get(i);
+
+							HashMap<String, Object> map = new HashMap<>();
+							UserEO assigneenActual = userEoService.getUserById(busProcessEntrust.getUserId());
+							String consigner = assigneenActual.getUsname();
+							UserEO userById = userEoService.getUserById(busProcessEntrust.getEnUserId());
+							String enUserName = userById.getUsname();
+							map.put("assignee", enUserName+"(" + consigner + " 委托)");
+							map.put("assigneeId", busProcessEntrust.getEnUserId());
+							map.put("prcType",one.getPrcType());
+							map.put("prcName",one.getPrcName());
+							map.put("prcNum",one.getPrcNum());
+							Date createTime = busProcessEntrust.getCreateTime();
+							map.put("createTime",createTime);
+							if (i+1 != EOS.size()){
+								BusProcessEntrust busProcessEntrust1 = EOS.get(i + 1);
+								Date endTime = busProcessEntrust1.getCreateTime();
+								map.put("endTime",endTime);
+								//long approvalTime = disposeApprovalTime(createTime,endTime);
+								LocalDateTime startDateTime = LocalDateTime.ofInstant(createTime.toInstant(), ZoneId.systemDefault());
+								LocalDateTime endDateTime = LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault());
+								long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1;
+								historicTaskInstance.put("approvalTime",days + "天");
+							}
+							relistMap.add(map);
+						}
+						continue;
 					}
 				}
 			}
@@ -145,9 +173,10 @@ public class TaskController {
 				long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1;
 				historicTaskInstance.put("approvalTime",days + "天");
 			}
+			relistMap.add(historicTaskInstance);
 		}
 		if(StringUtils.isNotBlank(sortWord)){
-			Collections.sort(list, new Comparator<Map<String, Object>>() {
+			Collections.sort(relistMap, new Comparator<Map<String, Object>>() {
 				@Override
 				public int compare(Map<String, Object> o1, Map<String, Object> o2) {
 					String id1 = (String) o1.get(sortWord);
@@ -160,7 +189,7 @@ public class TaskController {
 				}
 			});
 		}
-		return list;
+		return relistMap;
 	}
 
 

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java

@@ -329,18 +329,19 @@ public class TodoTaskController {
                     if (StrUtil.isEmpty(task.getAssignee())) {
                         taskService.claim(busMes.getTaskId(), busMes.getUserId());
                     }
+                    if (StringUtils.isNotEmpty(dataJson)){
+                        //根据业务情况 对业务数据进行saveOrupdate
+                       reportId = activitDefineService.saveOrUpdateDate(busMes.getPrcType(), dataJson, task.getId(),
+                                task.getProcessInstanceId(), reportId);
+                    }
                     BusProcessApprove busProcessApprove = new BusProcessApprove();
                     busProcessApprove.setTaskId(busMes.getTaskId());
                     busProcessApprove.setCreateUserId(UserUtils.getUserId());
                     busProcessApprove.setPrcId(task.getProcessInstanceId());
                     busProcessApprove.setCreateDate(new Date());
                     busProcessApprove.setFromValsJson(busMes.getSubmitJson());
+                    busProcessApprove.setDataId(reportId);
                     ibusProcessApproveService.save(busProcessApprove);
-                    if (StringUtils.isNotEmpty(dataJson)){
-                        //根据业务情况 对业务数据进行saveOrupdate
-                        activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dataJson, task.getId(),
-                                task.getProcessInstanceId(),reportId);
-                    }
                     taskService.complete(busMes.getTaskId());
                 }
             } else {
@@ -452,7 +453,8 @@ public class TodoTaskController {
         // 查找详细业务数据
         BusProcessNewVO busProcessNewVO = this.queryDetailDate(busProcessNew, prcType);
         //审批数据
-        BusProcessApprove busProcessApprove = busProcessApproveMapper.selectEoByDataId(busProcessNewVO.getDataId());
+        List<BusProcessApprove> busProcessApproves1 = busProcessApproveMapper.selectEoByDataId(busProcessNewVO.getDataId());
+        BusProcessApprove busProcessApprove = busProcessApproves1.get(0);
         if (busProcessApprove!=null){
             String approveJson = busProcessApprove.getFromValsJson();
             busProcessNewVO.setSubmitJson(approveJson);
@@ -477,7 +479,8 @@ public class TodoTaskController {
             List<BusProcessApprove> busProcessApproves = busProcessApproveMapper.selectEoByPrcIdAndTask(prcId);
             busProcessApprove = busProcessApproves.get(0);
         }else {
-            busProcessApprove = busProcessApproveMapper.selectEoByDataId(dataId);
+            List<BusProcessApprove> busProcessApproves = busProcessApproveMapper.selectEoByDataId(dataId);
+            busProcessApprove = busProcessApproves.get(0);
         }
         busProcessNewVO.setSubmitJson(busProcessApprove.getFromValsJson());
         return Result.success(busProcessNewVO);
@@ -592,7 +595,8 @@ public class TodoTaskController {
         }
         //存储审批数据
         if (StringUtils.isNotEmpty(submitJson)){
-            BusProcessApprove busProcessApprove = busProcessApproveMapper.selectEoByDataId(dataId);
+            List<BusProcessApprove> busProcessApproves = busProcessApproveMapper.selectEoByDataId(dataId);
+            BusProcessApprove busProcessApprove = busProcessApproves.get(0);
             if (busProcessApprove == null){
                 busProcessApprove = new BusProcessApprove();
                 busProcessApprove.setDataId(dataId);

report-activity/src/main/java/com/adc/da/wkflow/business_main/mapper/BusProcessApproveMapper.java

@@ -19,7 +19,7 @@ public interface BusProcessApproveMapper extends BaseMapper<BusProcessApprove> {
 
     List<BusProcessApprove> selectEoByPrcIdAndTask(@Param("prcId") String prcId);
 
-    BusProcessApprove selectEoByDataId(@Param("dataId") String dataId);
+    List<BusProcessApprove>  selectEoByDataId(@Param("dataId") String dataId);
 
     BusProcessApprove selectEoByTask(@Param("taskId")String taskId);
 }

report-activity/src/main/resources/mybatis/mapper/mysql/BusProcessApproveMapper.xml

@@ -7,7 +7,7 @@
         Order by CREATE_DATE desc
     </select>
     <select id="selectEoByDataId" resultType="com.adc.da.wkflow.business_main.entity.BusProcessApprove">
-        select * from bus_process_approve where data_id =#{dataId}
+        select * from bus_process_approve where data_id =#{dataId}  Order by CREATE_DATE desc
     </select>
     <select id="selectEoByTask" resultType="com.adc.da.wkflow.business_main.entity.BusProcessApprove">
         select * from bus_process_approve where task_id =#{taskId}

report-activity/target/classes/mybatis/mapper/mysql/BusProcessApproveMapper.xml

@@ -7,7 +7,7 @@
         Order by CREATE_DATE desc
     </select>
     <select id="selectEoByDataId" resultType="com.adc.da.wkflow.business_main.entity.BusProcessApprove">
-        select * from bus_process_approve where data_id =#{dataId}
+        select * from bus_process_approve where data_id =#{dataId}  Order by CREATE_DATE desc
     </select>
     <select id="selectEoByTask" resultType="com.adc.da.wkflow.business_main.entity.BusProcessApprove">
         select * from bus_process_approve where task_id =#{taskId}