From e401652ec4cfc814b1f946ee4cd13c9f5d51d557 Mon Sep 17 00:00:00 2001
From: Ledo <Watch13755@#.>
Date: Fri, 18 Jul 2025 10:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E6=9F=A5=E8=AF=A2sql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskDispatchDetailMapper.java             | 92 +++++++++----------
 1 file changed, 41 insertions(+), 51 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 e01a79a..950698b 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
@@ -316,63 +316,53 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
                 .leftJoin(ProcessBomDetailDO.class, "d", ProcessBomDetailDO::getId, TaskDispatchDO::getBomDetailId)
                 .leftJoin(ProcedureDO.class, "e", ProcedureDO::getId, TaskDispatchDetailDO::getProcedureId)
                 .leftJoin(TaskReportDO.class, "f", TaskReportDO::getDispatchDetailId, TaskDispatchDetailDO::getId)
-                .ne(ProjectOrderDO::getStatus,6)
                 .groupBy(TaskDispatchDetailDO::getId)
-                .disableSubLogicDel();
+                .disableSubLogicDel();;
+        if (reqVO.getProcedureStatusList().size() == 1 && reqVO.getProcedureStatusList().get(0) == 2) {
+            // 完工降序
+            query.orderByDesc(TaskDispatchDetailDO::getDispatchId, TaskDispatchDetailDO::getSort);
+        } else {
+            // 未完工升序
+            query.eq(TaskDispatchDO::getDispatchStatus, 2)
+                    .orderByAsc(TaskDispatchDetailDO::getDispatchId, TaskDispatchDetailDO::getSort);
+        }
+
         if (reqVO.getSubOrDetailName() != null && !reqVO.getSubOrDetailName().trim().equals("")){
-            query.apply("(b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')");
+            query.and( e ->e.like(ProjectOrderDO::getProjectName, reqVO.getSubOrDetailName()).or().like(
+                    ProjectOrderSubDO::getName, reqVO.getSubOrDetailName()
+            ));
+         //   query.eq(" (b.project_name like '%" + reqVO.getSubOrDetailName() + "%' or c.name like '%" + reqVO.getSubOrDetailName() + "%')");
         }
-        if (reqVO.getProcedureStatusList().size()==1 && reqVO.getProcedureStatusList().get(0)==2){
-            //完工降序
-            query.orderByDesc(TaskDispatchDetailDO::getDispatchId,TaskDispatchDetailDO::getSort);
-        }else {
-            //未完工升序
+        query.and(wrapper -> {
+            wrapper.ne(ProjectOrderDO::getStatus,6);
 
-            query.eq(TaskDispatchDO::getDispatchStatus,2)
-                    .orderByAsc(TaskDispatchDetailDO::getDispatchId,TaskDispatchDetailDO::getSort)
-            ;
-        }
-//        if (CollUtil.isNotEmpty(postIds)) {
-//            query.and(i -> i
-//                    .and(j -> j.in(TaskDispatchDetailDO::getPostId, postIds))
-//                    .and(j -> j.isNull(TaskDispatchDetailDO::getOwner))
-//                    .or(k-> k.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner()))
-//            );
-//        }else{
-//            query.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner());
-//        }
-        if (CollUtil.isNotEmpty(postIds)) {
-            query.and(i -> {
-                // 为每个岗位创建对应的工序查询条件
-                for (String postId : postIds.keySet()) {
-                    Long processId = postIds.get(postId);
-                    if (ObjectUtil.isNotEmpty(processId)) {
-                        i.or(j -> j
-                                .eq(TaskDispatchDetailDO::getPostId, postId)
-                                .eq(TaskDispatchDetailDO::getProcedureId, processId)
-                                .isNull(TaskDispatchDetailDO::getOwner)
-                        );
-                    }else {
-                        i.or(j -> j
-                                .eq(TaskDispatchDetailDO::getPostId, postId)
-                                .isNull(TaskDispatchDetailDO::getOwner)
-                        );
+            if (CollUtil.isNotEmpty(postIds)) {
+                wrapper.and(i -> {
+                    // 为每个岗位创建对应的工序查询条件
+                    for (String postId : postIds.keySet()) {
+                        Long processId = postIds.get(postId);
+                        if (ObjectUtil.isNotEmpty(processId)) {
+                            i.or(j -> j.eq(TaskDispatchDetailDO::getPostId, postId)
+                                    .eq(TaskDispatchDetailDO::getProcedureId, processId)
+                                    .isNull(TaskDispatchDetailDO::getOwner));
+                        } else {
+                            i.or(j -> j.eq(TaskDispatchDetailDO::getPostId, postId)
+                                    .isNull(TaskDispatchDetailDO::getOwner));
+                        }
                     }
-                }
-            });
-            // 添加所有者查询条件
-            query.or(k-> k.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner()));
+                });
+                // 添加所有者查询条件
+                wrapper.or(k -> k.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner()));
+            } else {
+                wrapper.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner());
+            }
 
-        }else{
-            query.eq(reqVO.getOwner() != null, TaskDispatchDetailDO::getOwner, reqVO.getOwner());
-        }
-        query
-                .in(CollUtil.isNotEmpty(reqVO.getProcedureStatusList()), TaskDispatchDetailDO::getProcedureStatus, reqVO.getProcedureStatusList())
-                .eq(reqVO.getIsReport() != null, ProcedureDO::getIsReport, reqVO.getIsReport())
-                .eq(!StringUtils.isEmpty(reqVO.getDispatchType()), TaskDispatchDO::getDispatchType, reqVO.getDispatchType())
-                .eq(reqVO.getTaskId() != null, TaskDispatchDO::getTaskId, reqVO.getTaskId())
-                .eq(reqVO.getBomDetailId() != null, TaskDispatchDO::getBomDetailId, reqVO.getBomDetailId())
-        ;
+            wrapper.in(CollUtil.isNotEmpty(reqVO.getProcedureStatusList()), TaskDispatchDetailDO::getProcedureStatus, reqVO.getProcedureStatusList())
+                    .eq(reqVO.getIsReport() != null, ProcedureDO::getIsReport, reqVO.getIsReport())
+                    .eq(!StringUtils.isEmpty(reqVO.getDispatchType()), TaskDispatchDO::getDispatchType, reqVO.getDispatchType())
+                    .eq(reqVO.getTaskId() != null, TaskDispatchDO::getTaskId, reqVO.getTaskId())
+                    .eq(reqVO.getBomDetailId() != null, TaskDispatchDO::getBomDetailId, reqVO.getBomDetailId());
+        });
 
         return selectPage(reqVO, query);
     }