From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
index 5b19064..f82e765 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
@@ -18,11 +20,15 @@
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEquipmentReportRepairService;
import org.jeecg.modules.eam.service.IFaultDescriptionService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
import java.util.Map;
/**
@@ -43,13 +49,12 @@
@Autowired
private ISysBaseAPI sysBaseApi;
+ @Autowired
+ private ISysUserService userService;
@Autowired
@Lazy
private IFaultDescriptionService faultDescriptionService;
-// @Autowired
-// private IUploadRelaService uploadRelaService;
-
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -88,17 +93,39 @@
@AutoLog(value = "mom_eam_equipment_report_repair-娣诲姞")
@ApiOperation(value = "mom_eam_equipment_report_repair-娣诲姞", notes = "mom_eam_equipment_report_repair-娣诲姞")
@PostMapping(value = "/add")
+ @Transactional(rollbackFor = {Exception.class})
public Result<String> add(@RequestBody EquipmentReportRepair equipmentReportRepair) {
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("1");
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepairService.save(equipmentReportRepair);
+ Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
+ equipment.setEquipmentStatus("2");
+ String teamId = equipment.getTeamId();
+ if(StringUtils.isNotBlank(teamId)){
+ List<SysUser> sysUsers = userService.list(new QueryWrapper<SysUser>()
+ .eq("team_id",teamId)
+ .eq("del_flag",0));
+ for(SysUser user:sysUsers){
+ String msg = "缁熶竴缂栧彿涓恒��"+equipment.getNum()+"銆戠殑璁惧闇�瑕佺淮淇紝璇风Щ姝ヨ嚦鏁呴殰鎶ヤ慨鏌ョ湅";
+ MessageDTO messageDTO = new MessageDTO();
+ messageDTO.setTitle("鏁呴殰鎶ヤ慨鎻愰啋");
+ messageDTO.setContent(msg);
+ messageDTO.setCategory("鏁呴殰鎶ヤ慨鎻愰啋");
+ messageDTO.setFromUser("鏁呴殰鎶ヤ慨鎻愰啋灏忓姪鎵�");
+ messageDTO.setToUser(user.getUsername());
+ sysBaseApi.sendSysAnnouncement(messageDTO);
+ }
+ }else {
+ return Result.error("璇ヨ澶囧皻鏈淮鎶ょ淮淇彮缁�,璇风淮鎶ゅ悗鍐嶆姤淇�");
+ }
//娣诲姞鏁呴殰鎻忚堪淇℃伅
FaultDescription faultDescription = new FaultDescription();
faultDescription.setFaultDetails(equipmentReportRepair.getFaultDescription());
faultDescription.setFaultId(equipmentReportRepair.getId());
faultDescription.setPhoto(equipmentReportRepair.getPhoto());
faultDescriptionService.save(faultDescription);
+ equipmentService.updateById(equipment);
return Result.OK("娣诲姞鎴愬姛锛�");
}
--
Gitblit v1.9.3