From d5a8df76a149013afd8e4c065a910429c1d3227e Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Tue, 16 May 2023 17:13:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/sys/controller/MenuEOController.class  | Bin 9328 -> 8358 bytes
 .../task/TaskController.java                  |  16 ++++++++++++++--
 .../task/TaskController.class                 | Bin 14619 -> 14909 bytes
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/MenuEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/MenuEOController.class
index aef06555286ce5bd048a560e67ad9eb771d852c1..900101325ec36ddaf7bb1004f7fd61d7046b0f0c 100644
GIT binary patch
delta 2577
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
M+(-F-(>Nda1M5VxdH?_b

delta 3578
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

diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
index 387d8e1..e4a3457 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java
+++ b/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"));
diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class
index d72afbea7ef0c990f1d79f5f6f0349f26fe9b841..e4cd0d1a0eddf4fef422a5b32d7d029b5b0d8fa9 100644
GIT binary patch
delta 4053
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
D7hmG`

delta 3780
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
QziVOfI$qBk7~x<43A_WCtpET3