From 806ae14a9a946671e5aa05fb9ca9de77034c85fd Mon Sep 17 00:00:00 2001
From: think <1787994136@qq.com>
Date: Fri, 24 Jan 2025 12:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/taskdispatch/TaskDispatchDetailMapper.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
index 4889b32..2904a5e 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java
@@ -42,13 +42,17 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
         query.select( "DATE_FORMAT(t.create_time, '%Y-%m') as yearMonth,\n" +
                 "       t.owner," +
                 " t.device_model," +
-                " max(c.name) as manufacturingEquipment," +
+                " CASE " +
+                "        WHEN t.device_model IS NULL THEN '' " +
+                "        ELSE (select c.name from base_equip_manufacture c where c.id = t.device_model)  " +
+                " END AS manufacturingEquipment," +
                 " sum(t.work_time) as totalPlannedHours," +
                 " sum(b.work_time) as totalReportedHours," +
                 " sum(t.amount) as totalDispatchedQuantity," +
                 " sum(b.amount) as totalReportedQuantity,max(u2.username) as workerId ,max(u2.nickname) as workerName ")
                 .leftJoin(TaskReportDO.class,"b",TaskReportDO::getDispatchDetailId,TaskDispatchDetailDO::getId)
-                .leftJoin(EquipManufactureDO.class,"c",EquipManufactureDO::getId,TaskDispatchDetailDO::getDeviceModel)
+                //.leftJoin("base_equip_manufacture c on c.id = t.device_model or t.device_model is null ")
+                //.leftJoin(EquipManufactureDO.class,"c",EquipManufactureDO::getId,TaskDispatchDetailDO::getDeviceModel)
                 .leftJoin("system_users u2 on u2.id = t.owner");
         if (pageReqVO.getWorkerIdOrName()!= null &&!pageReqVO.getWorkerIdOrName().isEmpty()) {
             query.and(i -> i.like("u2.username", pageReqVO.getWorkerIdOrName()).or().like("u2.nickname", pageReqVO.getWorkerIdOrName()));