From ec644df370356afa144f4df6da6e5de3d5a58909 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 七月 2024 10:14:12 +0800
Subject: [PATCH] 修改任务日志查询中持续时间不显示,增加结束时间字段

---
 src/main/webapp/views/taskWrkLog/taskWrkLog.html |    2 ++
 src/main/java/com/zy/asrs/entity/TaskWrkLog.java |   57 +++++++++++++++++++++++++++++++++------------------------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index 37c83aa..8ba7586 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -1,35 +1,20 @@
 package com.zy.asrs.entity;
 
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
 import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 @Data
 @TableName("wcs_task_wrk_log")
@@ -316,5 +301,29 @@
         return null;
     }
 
+    /**
+     * 鑾峰彇鎸佺画鏃堕棿
+     */
+    public String getDurationTime() {
+        if (Cools.isEmpty(this.createTime)) {
+            return "";
+        }
+
+        Date endDate = new Date();
+        if (!Cools.isEmpty(this.completeTime)) {
+            endDate = this.completeTime;
+        }
+
+        //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+        long l = this.createTime.getTime() - endDate.getTime();
+
+        //鍒嗗埆璁$畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+        long day = l / (24 * 60 * 60 * 1000);
+        long hour = (l / (60 * 60 * 1000) - day * 24);
+        long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+        long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+        return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
+    }
 
 }
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index a20a4ce..9ef3e8d 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -77,6 +77,8 @@
 						</el-table-column>
 						<el-table-column property="durationTime" label="鎸佺画鏃堕暱">
 						</el-table-column>
+						<el-table-column property="completeTime$" label="缁撴潫鏃堕棿">
+						</el-table-column>
 						<el-table-column property="ioType$" label="浠诲姟绫诲瀷">
 						</el-table-column>
 						<el-table-column property="startPoint" label="璧风偣浣嶇疆">

--
Gitblit v1.9.1