From e9b1f8d5a5b710a1c26aa6fd6774686be5d0f8f6 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 09:07:02 +0800
Subject: [PATCH] 消息提醒

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
index 0e1e02e..1f9cea1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderReportController.java
@@ -198,7 +198,7 @@
                 equipment.setTechnologyStatus(calibrationOrderReport.getJudgmentResult());
                 eamEquipmentService.updateById(equipment);
 
-                this.equipmentTechnologyStatuAlart(equipment.getNum());
+                this.equipmentTechnologyStatuAlart(equipment.getNum(),equipment.getTechnologyStatus());
             }
             String judgmentResult = calibrationOrderReport.getJudgmentResult();
             if("disabledScrapping".equals(judgmentResult)){
@@ -208,7 +208,12 @@
         }
     }
 
-    void equipmentTechnologyStatuAlart(String equipmentNum){
+    void equipmentTechnologyStatuAlart(String equipmentNum,String technologyStatus){
+
+        SysDict sysDictT = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","technology_status"),false);
+        SysDictItem sysDictItemt = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_value",technologyStatus)
+                .eq("dict_id",sysDictT.getId()),false);
+
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
         SysDictItem sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_text","杩愪繚璁惧绠$悊鍛�")
@@ -218,7 +223,7 @@
         List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId()));
         for(SysUserRole sysUserRole:sysUserRoles){
             SysUser user = sysUserService.getById(sysUserRole.getUserId());
-            String msg = sysUser.getRealname()+"灏嗙粺涓�缂栧彿涓恒��"+equipmentNum+"銆戠殑鎶�鏈姸鎬佷慨鏀逛负宸茬鐢�";
+            String msg = sysUser.getRealname()+"灏嗙粺涓�缂栧彿涓恒��"+equipmentNum+"銆戠殑鎶�鏈姸鎬佷慨鏀逛负銆�"+sysDictItemt.getItemText()+"銆�";
             MessageDTO messageDTO = new MessageDTO();
             messageDTO.setTitle("璁惧鍙拌处鎶�鏈姸鎬佷慨鏀�");
             messageDTO.setContent(msg);

--
Gitblit v1.9.3