[修改] 审批历史的时间

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

@@ -33,6 +33,7 @@ import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @Api(tags = "流程明细管理")
@@ -76,7 +77,8 @@ public class TaskController {
 		List<Map<String,Object>> list = ActivitiTools.turnHistoricTaskInstance(list2);
 		List<Map<String, Object>> relistMap = new ArrayList<>();
 
-		for (Map<String, Object> historicTaskInstance : list) {
+		for (int j = 0; j < list.size(); j++) {
+			Map<String, Object> historicTaskInstance = list.get(j);
 			// 获取办理的历史信息
 			if(historicTaskInstance.get("assignee") == null) {
 				String taskId = historicTaskInstance.get("id").toString();
@@ -120,19 +122,42 @@ public class TaskController {
 							map.put("prcType",one.getPrcType());
 							map.put("prcName",one.getPrcName());
 							map.put("prcNum",one.getPrcNum());
-							Date createTime = busProcessEntrust.getCreateTime();
+							Date createTime1 = busProcessEntrust.getCreateTime();
+							LocalDateTime dt = LocalDateTime.ofInstant(busProcessEntrust.getCreateTime().toInstant(), ZoneId.systemDefault());
+							String createTime = dt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 							map.put("createTime",createTime);
 							map.put("approvalOpinion",busProcessEntrust.getApprovalOpinion());
 							if (i+1 != EOS.size()){
 								BusProcessEntrust busProcessEntrust1 = EOS.get(i + 1);
-								Date endTime = busProcessEntrust1.getCreateTime();
+								LocalDateTime en =
+										LocalDateTime.ofInstant(busProcessEntrust1.getCreateTime().toInstant(), ZoneId.systemDefault());
+								String endTime = en.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 								map.put("endTime",endTime);
-								//long approvalTime = disposeApprovalTime(createTime,endTime);
+								LocalDateTime startDateTime =
-								LocalDateTime startDateTime = LocalDateTime.ofInstant(createTime.toInstant(), ZoneId.systemDefault());
+										LocalDateTime.ofInstant(busProcessEntrust1.getCreateTime().toInstant(),
-								LocalDateTime endDateTime = LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault());
+												ZoneId.systemDefault());
+								LocalDateTime endDateTime = LocalDateTime.ofInstant(busProcessEntrust1.getCreateTime().toInstant(), ZoneId.systemDefault());
 								long days = Duration.between(startDateTime.toLocalDate().atStartOfDay(), endDateTime.toLocalDate().atStartOfDay()).toDays() + 1;
-								historicTaskInstance.put("approvalTime",days + "天");
+								map.put("approvalTime",days + "天");
 							}else {
+								if (j+1<list.size()){
+									Map<String, Object> stringObjectMap = list.get(j + 1);
+									Object create = stringObjectMap.get("createTime");
+									if(create!=null){
+										SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+										Date endTime = sdf.parse((String)create);
+										LocalDateTime en =
+												LocalDateTime.ofInstant(endTime.toInstant(), ZoneId.systemDefault());
+										String endTimestr = en.format(DateTimeFormatter.ofPattern("yyyy-MM-dd " +
+												"HH:mm:ss"));
+										map.put("endTime",endTimestr);
+										LocalDateTime startDateTime = LocalDateTime.ofInstant(createTime1.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 + "天");
+									}
+								}
 								QueryWrapper<BusProcessApprove> datasQueryWrapper = new QueryWrapper<>();
 								datasQueryWrapper.lambda().eq(BusProcessApprove::getTaskId,historicTaskInstance.get("id"));
 								List<BusProcessApprove> approveList = iBusProcessApproveService.list(datasQueryWrapper);

report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessEntrust.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,6 +55,7 @@ public class BusProcessEntrust implements Serializable {
     private String prcName;
 
     @TableField("CREATE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime = new Date(System.currentTimeMillis());;
 
     @TableField("VALID_FLAG")