From 2213313cce5ea3a3fd425c5e51d2129dcba28689 Mon Sep 17 00:00:00 2001 From: z Date: Fri, 16 May 2025 15:01:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E6=9C=AC=E5=BD=92?= =?UTF-8?q?=E9=9B=86=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java | 2 +- .../src/views/heli/taskreport/TaskReportForm.vue | 2 +- 2 files changed, 2 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/TaskDispatchMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java index 14b68d1..db405ac 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchMapper.java @@ -161,7 +161,7 @@ public interface TaskDispatchMapper extends BaseMapperX { default List getListJg(Long id, Long projectSubId){ MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(TaskDispatchDO.class) - .select("z.name as materialName", "z.procedure_type as materialType", "SUM(COALESCE(d.work_time, 0)) as amount") + .select("z.name as materialName", "z.procedure_type as materialType", "CASE WHEN d.work_type = 1 THEN SUM(COALESCE(d.work_time, 0)) ELSE '' as amount") .select("p.grade_cost as shiJiMoney","u1.nickname as ownerName","p.name as name") .select(" ROUND(SUM(CASE WHEN d.work_type = 1 THEN COALESCE(d.work_time, 0) * p.grade_cost ELSE COALESCE(d.work_time, 0) END), 2) as zanGuMoney") .leftJoin(TaskDispatchDetailDO.class, "x", TaskDispatchDetailDO::getDispatchId,TaskDispatchDO::getId) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/TaskReportForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/TaskReportForm.vue index b2f0d8b..9fda121 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/TaskReportForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/TaskReportForm.vue @@ -14,7 +14,7 @@ - +