From 533ac6300ee034904ded84263b20f41784e2dbe0 Mon Sep 17 00:00:00 2001
From: think <1787994136@qq.com>
Date: Fri, 7 Feb 2025 17:43:09 +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

---
 .../admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java   | 2 +-
 .../dal/mysql/taskdispatch/TaskDispatchDetailMapper.java   | 7 ++++++-
 .../src/views/heli/taskdispatch/detail.vue                 | 4 ++--
 .../src/views/heli/taskdispatch/detailDialog.vue           | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java
index 723b1c0..d07ea37 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskdispatch/vo/TaskDispatchDetailTotalVO.java
@@ -107,7 +107,7 @@ public class TaskDispatchDetailTotalVO {
     private BigDecimal maxLongTime;
 
     @Schema(description = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE")
-    private String dispatchType;
+    private String  dispatchTypes;
 
 
 }
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 7e0c86c..c4935fe 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
@@ -255,6 +255,11 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
         // 计算时间范围
         LocalDateTime startDate = sTime.minusDays(3).withHour(0).withMinute(0).withSecond(0);
         LocalDateTime endDate = sTime.plusDays(3).withHour(23).withMinute(59).withSecond(59);
+
+
+
+
+
         // 构建查询条件过滤数据
         int isHaveOf = 0;
         MPJLambdaWrapper<TaskDispatchDetailDO> query = new MPJLambdaWrapper<>();
@@ -269,7 +274,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
         //增加一个关联查询条件 ，装配派工只查装配派工，生产派工只查生产派工
         query2.selectAll(TaskDispatchDetailDO.class);
         query2.leftJoin(TaskDispatchDO.class,"a",TaskDispatchDO::getId,TaskDispatchDetailDO::getDispatchId)
-              .eq(TaskDispatchDO::getDispatchType,pageTotalVO.getDispatchType());
+              .eq(TaskDispatchDO::getDispatchType,pageTotalVO.getDispatchTypes());
         query2.eq(TaskDispatchDetailDO::getDeviceModel, pageTotalVO.getDeviceModel())
                 .and(wrapper -> {
                     wrapper.ge(TaskDispatchDetailDO::getStartTime, startDate)
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
index a9944ef..e45a22e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
@@ -710,7 +710,7 @@ watch(
 					console.log("detail==", detail)
 					if(detail.startTime){
 						//设置派工类型
-						detail.dispatchType = "ASSEMBLE";
+						detail.dispatchTypes = "ASSEMBLE";
 						openDialogWT(detail);
 					}
 				}
@@ -724,7 +724,7 @@ watch(
 			            console.log("detail==", detail);
 			            if (detail.startTime) {
 							//设置派工类型
-							detail.dispatchType = "ASSEMBLE";
+							detail.dispatchTypes = "ASSEMBLE";
 			                openDialogWT(detail);
 			            }
 			        }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
index eb6b586..cc068b8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue
@@ -756,7 +756,7 @@ watch(
 					console.log("detail=", detail.startTime)
 					if(detail.startTime){
 						//设置派工类型
-						detail.dispatchType = "PRODUCTION";
+						detail.dispatchTypes = "PRODUCTION";
 						openDialogWT(detail);
 					}
 				}
@@ -770,7 +770,7 @@ watch(
 			            console.log("detail==", detail);
 			            if (detail.startTime) {
 							//设置派工类型
-							detail.dispatchType = "PRODUCTION";
+							detail.dispatchTypes = "PRODUCTION";
 			                openDialogWT(detail);
 			            }
 			        }