[修改] 监控流程审核历史

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

@@ -138,7 +138,7 @@ public class TaskController {
 								String endTime = en.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 								map.put("endTime",endTime);
 								LocalDateTime startDateTime =
-										LocalDateTime.ofInstant(busProcessEntrust1.getCreateTime().toInstant(),
+										LocalDateTime.ofInstant(busProcessEntrust.getCreateTime().toInstant(),
 												ZoneId.systemDefault());
 								LocalDateTime endDateTime = LocalDateTime.ofInstant(busProcessEntrust1.getCreateTime().toInstant(), ZoneId.systemDefault());
 								long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1;
@@ -155,12 +155,24 @@ public class TaskController {
 										String endTimestr = en.format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
 												"HH:mm:ss"));
 										map.put("endTime",endTimestr);
-										LocalDateTime startDateTime = LocalDateTime.ofInstant(createTime1.toInstant()
+										LocalDateTime startDateTime = LocalDateTime.ofInstant(busProcessEntrust.getCreateTime().toInstant()
 												, ZoneId.systemDefault());
 										LocalDateTime endDateTime = LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault());
 										long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1;
 										map.put("approvalTime",days + "天");
 									}
+								}else {
+									Object endTime = historicTaskInstance.get("endTime");
+									map.put("endTime",historicTaskInstance.get("endTime"));
+									SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+									Date endTimed = sdf.parse((String)endTime);
+									LocalDateTime en =
+											LocalDateTime.ofInstant(endTimed.toInstant(), ZoneId.systemDefault());
+									LocalDateTime startDateTime = LocalDateTime.ofInstant(busProcessEntrust.getCreateTime().toInstant()
+											, ZoneId.systemDefault());
+									LocalDateTime endDateTime = LocalDateTime.ofInstant(endTimed.toInstant(), ZoneId.systemDefault());
+									long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1;
+									map.put("approvalTime",days + "天");
 								}
 								QueryWrapper<BusProcessApprove> datasQueryWrapper = new QueryWrapper<>();
 								datasQueryWrapper.lambda().eq(BusProcessApprove::getTaskId,historicTaskInstance.get("id"));