From c7823e6ee6719919599f56d6ecf247221d642b7e Mon Sep 17 00:00:00 2001
From: liwen <w790785492@163.com>
Date: Fri, 29 Mar 2024 14:40:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=B7=A1=E6=A3=80=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hnac/hzinfo/inspect/task/mapper/TaskMapper.xml | 22 +++++++++++++---------
 .../inspect/task/service/impl/TaskServiceImpl.java |  5 +++++
 .../com/hnac/hzinfo/inspect/task/vo/TaskVo.java    |  3 +++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
index 4c17bba..59ff1ce 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
@@ -180,9 +180,10 @@
         order by t.UPDATE_TIME desc
     </select>
     <select id="getAllPageList" parameterType="com.hnac.hzinfo.inspect.task.vo.TaskListQuery" resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">
-        SELECT t.*,u.USER_ID as userIds,u.USER_NAME from HZ_ST_EX_TASK t
-        LEFT JOIN HZ_ST_EX_TASK_USER u on t.ID=u.TASK_ID
-        and u.IS_DELETED=0
+        SELECT t.*,u.USER_ID as userIds,u.USER_NAME as userNames
+        from
+            HZ_ST_EX_TASK t
+            LEFT JOIN HZ_ST_EX_TASK_USER u on t.ID=u.TASK_ID and u.IS_DELETED=0
         where t.IS_DELETED=0
         <if test="task.userId != null ">
             and u.USER_ID=#{task.userId}
@@ -191,12 +192,15 @@
         order by t.UPDATE_TIME desc
     </select>
     <select id="getAllExportList"  resultType="com.hnac.hzinfo.inspect.task.vo.TaskVo">
-        SELECT t.*,b.USER_ID as userIds,(SELECT group_concat(u .user_name) FROM HZ_ST_EX_TASK_USER u WHERE t.ID=u.TASK_ID
-        <if test="task.userId != null ">
-            and u.USER_ID=#{task.userId}
-        </if>) AS  userNames from HZ_ST_EX_TASK t
-        LEFT JOIN HZ_ST_EX_TASK_USER b on t.ID=b.TASK_ID
-        and b.IS_DELETED=0
+        SELECT
+            t.*, b.USER_ID as userIds,
+            (SELECT group_concat(u.user_name) FROM HZ_ST_EX_TASK_USER u WHERE t.ID=u.TASK_ID
+            <if test="task.userId != null ">
+                and u.USER_ID=#{task.userId}
+            </if>) AS userNames
+        from
+            HZ_ST_EX_TASK t
+            LEFT JOIN HZ_ST_EX_TASK_USER b on t.ID=b.TASK_ID and b.IS_DELETED=0
         where t.IS_DELETED=0
         <if test="task.userId != null ">
             and u.USER_ID=#{task.userId}
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java
index 1f38fde..e367429 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java
@@ -538,6 +538,11 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, TaskEntity> imp
                     taskVo.setRobot(robotService.getDetailByUserId(taskVo.getUserId()));
                 }
             }
+            // 巡检时长计算
+            if (ObjectUtil.isNotEmpty(taskVo.getStartTime()) && ObjectUtil.isNotEmpty(taskVo.getEndTime())) {
+                long inspectTime = DateUtil.between(taskVo.getStartTime(), taskVo.getEndTime()).toMinutes();
+                taskVo.setInspectTime(Optional.of(inspectTime).orElse(0L));
+            }
             return taskVo;
         }).collect(Collectors.toList());
         pages.setRecords(list);
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskVo.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskVo.java
index 3b4f82b..f4b724d 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskVo.java
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskVo.java
@@ -29,4 +29,7 @@ public class TaskVo extends TaskEntity {
 
 	@ApiModelProperty("执行名称，按逗号分隔")
 	private String userNames;
+
+	@ApiModelProperty("巡检时长/分钟")
+	private Long inspectTime;
 }