From 7ba9e18346fb20444e3d4840315b01c7c96371f0 Mon Sep 17 00:00:00 2001 From: z Date: Wed, 9 Jul 2025 17:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9C=80=E6=B1=82=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E9=87=87=E8=B4=AD=E7=9A=84=E5=85=B3=E6=B3=A8=E5=BE=85?= =?UTF-8?q?=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bdgzsomthing/bdgzsomthingController.java | 1 + .../bdgzsomthing/bdgzsomthingServiceImpl.java | 10 ++-- .../attentiontodo/AttentiontodoMapper.xml | 1 + .../MaterialPlanBoomMapper.xml | 54 +++++-------------- .../MaterialPlanDetailMapper.xml | 40 ++++++-------- .../views/heli/taskdispatch/detailDialog.vue | 1 + 6 files changed, 38 insertions(+), 69 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java index 4a8e296..4551002 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/bdgzsomthing/bdgzsomthingController.java @@ -161,6 +161,7 @@ public class bdgzsomthingController { public void init() { selectHasPrice(); selectSafeStorageAndDeliverOneYear(); + bdgzsomthingService.selectds(); } @Scheduled(cron = "0 0 2 * * ?") public void selectHasPrice(){ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java index f880709..d327e26 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bdgzsomthing/bdgzsomthingServiceImpl.java @@ -424,9 +424,11 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { if (ObjectUtil.isEmpty(attentiontodoRespVO.getAttr4())){ TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectOne(new LambdaQueryWrapper().eq(TaskDispatchDO::getCode, deliverOrderDO.getCode())); if (ObjectUtil.isNotEmpty(taskDispatchDO)){ - AdminUserDO user = adminUserService.getUser(Long.valueOf(taskDispatchDO.getCreator())); - if (ObjectUtil.isNotEmpty(user)){ - BdgzsomthingDO.setClick(user.getNickname()); + if (ObjectUtil.isNotEmpty(taskDispatchDO.getCreator())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(taskDispatchDO.getCreator())); + if (ObjectUtil.isNotEmpty(user)){ + BdgzsomthingDO.setClick(user.getNickname()); + } } } }else { @@ -780,8 +782,6 @@ public class bdgzsomthingServiceImpl implements bdgzsomthingService { attentiontodoDO.setLevel("1"); attentiontodoDO.setEvday("10"); attentiontodookddfh9.add(attentiontodoDO); - - } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml index 546c655..d0edc3a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/attentiontodo/AttentiontodoMapper.xml @@ -24,6 +24,7 @@ SELECT a.*, a.tenant_id as txrid FROM db_attentiontodo a LEFT JOIN system_users b ON a.attr4 = b.nickname WHERE a.attr2 = #{param1} +group by a.id \ No newline at end of file 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 c80e1b2..383b20b 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 @@ -190,6 +190,7 @@ class="!w-260px" v-model="formData.createTime" type="date" value-format="x" +