From 3ded5085eb1e81d5591e6e512671137c9ab288bb Mon Sep 17 00:00:00 2001
From: MisG <1520956343@qq.com>
Date: Thu, 23 Jan 2025 17:37:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E3=80=81=E8=A3=85=E9=85=8D=E4=BB=BB=E5=8A=A1=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AE=A1=E5=88=92=E6=8F=90=E9=86=92=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/taskdispatch/TaskDispatchDetailMapper.java   | 2 +-
 .../src/views/heli/taskdispatch/detail.vue                 | 5 +++--
 .../src/views/heli/taskdispatch/detailDialog.vue           | 7 ++++---
 3 files changed, 8 insertions(+), 6 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 beda93d..0c43a13 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
@@ -477,7 +477,7 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
                             }
             }
         }
-        BigDecimal hoursAverage = stWorkTimeTotal.divide(new BigDecimal(7), RoundingMode.HALF_UP);
+        BigDecimal hoursAverage = stWorkTimeTotal.divide(new BigDecimal(7), 2, RoundingMode.HALF_UP);
         // 判断是否超出最大时长
         if (hoursAverage.compareTo(maxTime) > 0) {
             // 如果超时，返回符合条件的结果
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 5599991..00d7af0 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
@@ -707,7 +707,9 @@ watch(
 					}
 					console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`);
 					console.log("detail==", detail)
-					openDialogWT(detail);
+					if(detail.startTime){
+						openDialogWT(detail);
+					}
 				}
 			);
 			watches.push(unwatch); // 存储当前的取消监听函数
@@ -719,7 +721,6 @@ watch(
 const openDialogWT = async (dataParam) => {
 	taskDD.value = null;
 	taskDD.value = dataParam.startTime;
-	console.log("taskDD==", taskDD)
 	const data = await TaskDispatchApi.getTaskDispatchDetailListByWorkTime(dataParam);
 	//debugger
 	dataList.value = [];
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 db76541..0a5b087 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
@@ -753,8 +753,10 @@ watch(
 						return;
 					}
 					console.log(`第 ${index + 1} 行的预计工时变化为: ${newWorkTime}`);
-					console.log("detail==", detail)
-					openDialogWT(detail);
+					console.log("detail=", detail.startTime)
+					if(detail.startTime){
+						openDialogWT(detail);
+					}
 				}
 			);
 			watches.push(unwatch); // 存储当前的取消监听函数
@@ -766,7 +768,6 @@ watch(
 const openDialogWT = async (dataParam) => {
 	taskDD.value = null;
 	taskDD.value = dataParam.startTime;
-	console.log("taskDD==", taskDD)
 	const data = await TaskdispatchApi.getTaskDispatchDetailListByWorkTime(dataParam);
 	//debugger
 	dataList.value = [];