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 ++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 62 ++++++++++++++++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml | 11 +++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java | 5 ++
4 files changed, 78 insertions(+), 11 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);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index 862676c..682a7ce 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -9,6 +9,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -17,6 +18,7 @@
import org.apache.ibatis.annotations.Param;
import org.apache.poi.hssf.record.DVALRecord;
import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
@@ -38,8 +40,8 @@
import org.jeecg.modules.eam.vo.SysFileNameVo;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.entity.*;
+import org.jeecg.modules.system.service.*;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -110,6 +112,15 @@
@Autowired
private ISysFileNameService sysFileNameService;
+
+ @Resource
+ private ISysRoleService sysRoleService;
+ @Resource
+ private ISysDictService sysDictService;
+ @Resource
+ private ISysDictItemService sysDictItemService;
+ @Resource
+ private ISysUserRoleService sysUserRoleService;
/**
@@ -748,6 +759,8 @@
maintenanceOrder.setConfirmStatus(confirmStatus);
dailyMaintenanceOrderService.updateById(maintenanceOrder);
+
+ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇汉鍛�",maintenanceOrder.getNum());
}else if("2".equals(confirmStatus)){
finishTransferOrder.setEquipmentInspectorUser("");
finishTransferOrder.setRepairDirectorUser("");
@@ -757,12 +770,16 @@
maintenanceOrder.setConfirmStatus(confirmStatus);
dailyMaintenanceOrderService.updateById(maintenanceOrder);
+
+ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟搷浣滀汉鍛�",maintenanceOrder.getNum());
}else if("3".equals(confirmStatus)){
finishTransferOrder.setRepairUser(sysUser.getRealname());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
dailyMaintenanceOrderService.updateById(maintenanceOrder);
+
+ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇涓讳换",maintenanceOrder.getNum());
}else if("4".equals(confirmStatus)){
finishTransferOrder.setEquipmentInspectorUser("");
finishTransferOrder.setRepairDirectorUser("");
@@ -771,18 +788,24 @@
maintenanceOrder.setConfirmStatus(confirmStatus);
dailyMaintenanceOrderService.updateById(maintenanceOrder);
+
+ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇汉鍛�",maintenanceOrder.getNum());
}else if("5".equals(confirmStatus)){
finishTransferOrder.setRepairDirectorUser(sysUser.getRealname());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
dailyMaintenanceOrderService.updateById(maintenanceOrder);
+
+ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟楠屽憳",maintenanceOrder.getNum());
}else if("6".equals(confirmStatus)){
finishTransferOrder.setRepairDirectorUser("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
dailyMaintenanceOrderService.updateById(maintenanceOrder);
+
+ this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇涓讳换",maintenanceOrder.getNum());
}else if("7".equals(confirmStatus)){
finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname());
finishTransferOrderService.updateById(finishTransferOrder);
@@ -795,6 +818,41 @@
return Result.OK("瀹℃壒鎴愬姛!");
}
+ void twoMaintenanceAlert(String confirmStatus,String roleDictItem,String orderNum){
+
+ 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",roleDictItem)
+ .eq("dict_id",sysDict.getId()),false);
+ String roleCode = sysDictItem.getItemValue();
+ SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false);
+ 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 = "";
+ if("1".equals(confirmStatus)){
+ msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗕簩绾т繚鍏诲伐鍗曞彿銆�"+orderNum+"銆戠殑瀹屽伐绉讳氦鍗曠‘璁ら�氳繃锛岃鍒颁簩绾т繚鍏婚〉闈㈡煡鐪嬶紒";
+ }else if("2".equals(confirmStatus)){
+ msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗕簩绾т繚鍏诲伐鍗曞彿銆�"+orderNum+"銆戠殑瀹屽伐绉讳氦鍗曠‘椹冲洖锛岃鍒颁簩绾т繚鍏婚〉闈㈡煡鐪嬶紒";
+ }else if("3".equals(confirmStatus)){
+ msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗕簩绾т繚鍏诲伐鍗曞彿銆�"+orderNum+"銆戠殑瀹屽伐绉讳氦鍗曠‘璁ら�氳繃锛岃鍒颁簩绾т繚鍏婚〉闈㈡煡鐪嬶紒";
+ }else if("4".equals(confirmStatus)){
+ msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗕簩绾т繚鍏诲伐鍗曞彿銆�"+orderNum+"銆戠殑瀹屽伐绉讳氦鍗曠‘椹冲洖锛岃鍒颁簩绾т繚鍏婚〉闈㈡煡鐪嬶紒";
+ }else if("5".equals(confirmStatus)){
+ msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗕簩绾т繚鍏诲伐鍗曞彿銆�"+orderNum+"銆戠殑瀹屽伐绉讳氦鍗曠‘璁ら�氳繃锛岃鍒颁簩绾т繚鍏婚〉闈㈡煡鐪嬶紒";
+ }else if("6".equals(confirmStatus)){
+ msg = "銆�"+sysUser.getRealname()+"銆�"+"灏嗕簩绾т繚鍏诲伐鍗曞彿銆�"+orderNum+"銆戠殑瀹屽伐绉讳氦鍗曠‘椹冲洖锛岃鍒颁簩绾т繚鍏婚〉闈㈡煡鐪嬶紒";
+ }
+ MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("瀹屽伐绉讳氦鍗曟秷鎭彁閱掞紒");
+ messageDTO.setContent(msg);
+ messageDTO.setCategory(roleDictItem);
+ messageDTO.setFromUser("瀹屽伐绉讳氦鍗曟秷鎭彁閱掓彁閱掑皬鍔╂墜");
+ messageDTO.setToUser(user.getUsername());
+ sysBaseApi.sendSysAnnouncement(messageDTO);
+ }
+ }
+
@RequestMapping(value = "/editTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST})
@Transactional(rollbackFor = { Exception.class })
public Result<String> editTechnologyStatus(@RequestBody Equipment equipment) {
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
index b6375ac..3a6f19e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java
@@ -223,7 +223,9 @@
preInspection.setRepairDirectorUser(userId);
maintenanceOrder.setPrecisionInspectionStatus("2");
- }else if("2".equals(precisionInspectionStatus)){
+ }
+
+ if("2".equals(precisionInspectionStatus)){
preInspection.setEachTolerance(precisionInspection.getEachTolerance());
preInspection.setPartTolerance(precisionInspection.getPartTolerance());
preInspection.setEquipmentInspectorUser(userId);
@@ -233,6 +235,7 @@
preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setProcessPass(precisionInspection.getProcessPass());
preInspection.setMeetProcessRequire(precisionInspection.getMeetProcessRequire());
+ preInspection.setSparePart(precisionInspection.getSparePart());
preInspection.setUseUnitDirectorUser(userId);
maintenanceOrder.setPrecisionInspectionStatus("4");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
index c76e4ad..9d5059c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
@@ -12,11 +12,12 @@
t5.realname AS equipmentInspectorUserName,
t6.realname AS useUnitDirectorUserName,
t7.realname AS equipmentInspectorSignUserName,
- ISNULL(t1.each_tolerance,0) AS eachTolerance,
- ISNULL(t1.part_tolerance,0) AS partTolerance,
- ISNULL(t1.process_pass,0) AS processPass,
- ISNULL(t1.meet_process_require,0) AS meetProcessRequire,
- t1.judgment_result AS judgmentResult,
+ t1.spare_part as sparePart,
+ ISNULL(t1.each_tolerance,'0') AS eachTolerance,
+ ISNULL(t1.part_tolerance,'0') AS partTolerance,
+ ISNULL(t1.process_pass,'0') AS processPass,
+ ISNULL(t1.meet_process_require,'0') AS meetProcessRequire,
+ ISNULL(t1.judgment_result,'qualified') AS judgmentResult,
t1.remark,
t8.name AS equipmentName,
t8.model AS equipmentModel,
--
Gitblit v1.9.3