From 359d12dcd715e41e47ed97aff0f6de32df5dfd8f Mon Sep 17 00:00:00 2001
From: xuyuncong <3422692813@qq.com>
Date: Tue, 18 Nov 2025 17:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/DlRepairTitemController.java        | 21 +++++++++----------
 .../impl/DlRepairTicketsServiceImpl.java      |  4 ++--
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java
index 3d83bd81..d4453296 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/controller/admin/DlRepairTitemController.java
@@ -201,11 +201,11 @@ public class DlRepairTitemController {
     }
 
     /**
-     * 根据工单ID统计班组完成进度
-     *
-     * @author AI
-     * @date 2025/11/18
-     * @param ticketId 工单ID
+     * @description : 根据工单ID统计班组完成进度
+     * @author xyc
+     * @date 17:15 2025/11/18
+     * @param [ticketId]
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
      **/
     @GetMapping("/teamProgress")
     @Operation(summary = "根据工单ID统计班组完成进度")
@@ -214,12 +214,11 @@ public class DlRepairTitemController {
     }
 
     /**
-     * 根据班组查询班组下工时项目的完成情况
-     *
-     * @author AI
-     * @date 2025/11/18
-     * @param ticketId 工单ID
-     * @param workType 班组编码（工种类型）
+     * @description : 根据班组查询班组下工时项目的完成情况
+     * @author xyc
+     * @date 17:15 2025/11/18
+     * @param [ticketId, workType]
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<?>
      **/
     @GetMapping("/teamProjectStatus")
     @Operation(summary = "根据班组查询班组下工时项目的完成情况")
diff --git a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
index be25f55a..a8c1556d 100644
--- a/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
+++ b/dl-module-repair/src/main/java/cn/iocoder/yudao/module/tickets/service/impl/DlRepairTicketsServiceImpl.java
@@ -1314,7 +1314,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             RepairRecords record = finishedRecordMap.get(item.getId());
             if (record != null) {
                 vo.setFinished(true);
-                vo.setFinishTime(record.getCreateTime());
+                vo.setFinishTime(DateUtil.date(record.getCreateTime()));
                 vo.setFinisherId(record.getDealUserId());
                 vo.setFinisherName(record.getDealUserName());
             } else {
@@ -1375,7 +1375,7 @@ public class DlRepairTicketsServiceImpl extends ServiceImpl<DlRepairTicketsMappe
             String repairItemId = record.getRepairItemId();
             RepairRecords exist = finishedRecordMap.get(repairItemId);
             if (exist == null || (record.getCreateTime() != null && exist.getCreateTime() != null
-                    && record.getCreateTime().after(exist.getCreateTime()))) {
+                    && DateUtil.date(record.getCreateTime()).after(DateUtil.date(exist.getCreateTime())))) {
                 finishedRecordMap.put(repairItemId, record);
             }
         });