From 7819bc6c0cf2bb9702ea62ddb74b55eabcb25572 Mon Sep 17 00:00:00 2001
From: bupengxiang <bupengxiang@syxysoft.com>
Date: Wed, 26 Apr 2023 10:29:01 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=9A=84=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/TaskController.java                  | 25 +++++++++++++------
 .../wkflow/util/activiti/ActivitiTools.java   | 14 +++++++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

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 e6a8c37..c718409 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
@@ -28,10 +28,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 
-import static com.adc.da.wkflow.util.date.DateTools.disposeApprovalTime;
-
 @Api(tags = "流程明细管理")
 @RestController
 @RequestMapping("/${restPath}/task")
@@ -58,7 +61,7 @@ public class TaskController {
 	@ApiOperation(value = "流程实例明细列表")
 	@ApiImplicitParam(name = "prcNum", value = "流程实例id")
 	@GetMapping("/get_list_by_instance")
-	public List<Map<String, Object>> get_list_by_instance(String prcNum,String sortWord,String shunxu) {
+	public List<Map<String, Object>> get_list_by_instance(String prcNum,String sortWord,String shunxu) throws ParseException {
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("PRC_NUM",prcNum);
 		BusProcessName one = iBusProcessNameService.getOne(queryWrapper);
@@ -130,11 +133,17 @@ public class TaskController {
 				historicTaskInstance.put("approvalResult",formValsJsonMap.get("flag")!=null ? formValsJsonMap.get("flag"):"");
 				historicTaskInstance.put("approvalFile",formValsJsonMap.get("approvalFile")!=null ? formValsJsonMap.get("approvalFile"):"");
 			}
-			Date createTime = (Date) historicTaskInstance.get("createTime");
-			Date endTime = (Date) historicTaskInstance.get("endTime");
-			if(endTime!=null){
-				long approvalTime = disposeApprovalTime(createTime,endTime);
-				historicTaskInstance.put("approvalTime",approvalTime + "小时");
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			Date createTime = sdf.parse((String)historicTaskInstance.get("createTime"));
+			Object endTime1 = historicTaskInstance.get("endTime");
+			if(endTime1!=null){
+				Date endTime = sdf.parse((String)endTime1);
+//				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 + "天");
 			}
 		}
 		if(StringUtils.isNotBlank(sortWord)){
diff --git a/report-activity/src/main/java/com/adc/da/wkflow/util/activiti/ActivitiTools.java b/report-activity/src/main/java/com/adc/da/wkflow/util/activiti/ActivitiTools.java
index b26134e..bfe2cc6 100644
--- a/report-activity/src/main/java/com/adc/da/wkflow/util/activiti/ActivitiTools.java
+++ b/report-activity/src/main/java/com/adc/da/wkflow/util/activiti/ActivitiTools.java
@@ -10,6 +10,9 @@ import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -177,12 +180,19 @@ public class ActivitiTools {
 			map.put("assignee", model.getAssignee());
 			map.put("category", model.getCategory());
 			map.put("claimTime", model.getClaimTime());
-			map.put("createTime", model.getCreateTime());
+			LocalDateTime dt = LocalDateTime.ofInstant(model.getCreateTime().toInstant(), ZoneId.systemDefault());
+			String createTime = dt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+			map.put("createTime",createTime);
 			map.put("deleteReason", model.getDeleteReason());
 			map.put("description", model.getDescription());
 			map.put("dueDate", model.getDueDate());
 			map.put("drationInMillis", model.getDurationInMillis());
-			map.put("endTime", model.getEndTime());
+			String endTime = null;
+			if (model.getEndTime() != null){
+				LocalDateTime end = LocalDateTime.ofInstant(model.getEndTime().toInstant(), ZoneId.systemDefault());
+				endTime = end.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+			}
+			map.put("endTime", endTime);
 			map.put("executionId", model.getExecutionId());
 			map.put("formKey", model.getFormKey());
 			map.put("id", model.getId());