From 5746e59e622daa8ce62d0c29aaba9b8bd5308bcd Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 27 六月 2025 12:28:46 +0800
Subject: [PATCH] 修复问题
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 97 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
index 122da57..748c0dc 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
@@ -5,7 +5,10 @@
import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -18,6 +21,8 @@
import com.ruoyi.project.tr.JpushMsg.service.IJpushMsgService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.ibatis.javassist.expr.NewArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -49,6 +54,8 @@
@Autowired
JpushService jpushService;
+ @Autowired
+ private PreventRiskDangerConfirmLogService confirmLogService;
@Autowired
private RiskService riskService;
@@ -87,6 +94,12 @@
// hiddenDangerCheckPoint.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);/** 核查状态(待核查) */
startPage();
List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
+ for (HiddenDangerCheckPoint dangerCheck : list) {
+ List<PreventRiskDangerConfirmLog> logsByDangerCheckPointId = confirmLogService.getLogsByDangerCheckPointId(dangerCheck.getId());
+ if (logsByDangerCheckPointId.size() > 0){
+ dangerCheck.setConfirmLogList(logsByDangerCheckPointId);
+ }
+ }
return getDataTable(list);
}
@@ -100,7 +113,63 @@
startPage();
hiddenDangerCheckPoint.setExamineUserId(getSysUser().getUserId());//核查人为本登录帐号userId的
List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
+ for (HiddenDangerCheckPoint dangerCheck : list) {
+ List<PreventRiskDangerConfirmLog> logsByDangerCheckPointId = confirmLogService.getLogsByDangerCheckPointId(dangerCheck.getId());
+ if (logsByDangerCheckPointId.size() > 0){
+ dangerCheck.setConfirmLogList(logsByDangerCheckPointId);
+ }
+ }
return getDataTable(list);
+ }
+
+ /**
+ * 隐患核查--下一个核查人
+ */
+ @Log(title = "隐患核查--核查")
+ @GetMapping("/editNextConfirm/{id}")
+ public String editNextConfirm(@PathVariable("id") Long id, ModelMap mmap) {
+ //隐患排查实体
+ HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
+ mmap.put("hdcp", hiddenDangerCheckPoint);
+
+ //获取所在公司人员信息
+ User sysUser = getSysUser();
+ if (sysUser != null && sysUser.getCompanyId() != null) {
+ User userTemp = new User();
+ userTemp.setCompanyId(sysUser.getCompanyId());
+ List<User> userList = userService.selectUserList(userTemp);
+ mmap.put("userList", userList);
+ }
+ return prefix + "/editNextConfirm";
+ }
+
+ /**
+ * 隐患核查--下一个核查人
+ */
+ @Log(title = "隐患核查--下一个核查人")
+ @PostMapping("/editNextConfirmSave")
+ @ResponseBody
+ public AjaxResult editNextConfirmSave(HiddenDangerCheckPoint hdcp) {
+ //获取当前更新用户信息
+ User sysUser = getSysUser();
+
+ if(ObjectUtils.isEmpty(hdcp.getId())){
+ return AjaxResult.error("id不能为空");
+ }
+ // examine_user_id , 核查人id
+ if(ObjectUtils.isEmpty(hdcp.getExamineUserId())){
+ return AjaxResult.error("核查人Id不能为空");
+ }
+ // examine_user_name
+ if(ObjectUtils.isEmpty(hdcp.getExamineUserName())){
+ return AjaxResult.error("核查人姓名不能为空");
+ }
+ int i = confirmLogService.saveConfirmLog(hdcp);
+ if (i < 1){
+ return AjaxResult.error("操作失败");
+ }
+
+ return toAjax(i);
}
/**
@@ -127,6 +196,7 @@
/**
* 隐患核查--保存
+ *
*/
@Log(title = "隐患核查--保存", businessType = BusinessType.UPDATE)
@PostMapping("/editDangerExamineSave")
@@ -134,6 +204,8 @@
public AjaxResult editDangerExamineSave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
//获取当前更新用户信息
User sysUser = getSysUser();
+
+ // todo-2024
hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName());
hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());
hiddenDangerCheckPoint.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间
@@ -152,15 +224,28 @@
if(hiddenDangerCheckPoint.getRectifyDeadlineTime()!=null) {
rectifyRemindJPush(hiddenDangerCheckPoint);
}
+ //此处插入隐患附属表 20250623 位置变更注释掉
+ //HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
+// int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint);
+// if (result< 1){
+// throw new RuntimeException("添加隐患附属信息失败");
+// }
- // todo-2022 此处插入附属表
-// HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
- int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint);
+ //此处插入隐患附属表 20250623 改为更新
+ //HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
+ int result = riskService.updateDangerInfo(hiddenDangerCheckPoint);
if (result< 1){
- throw new RuntimeException("添加隐患附属信息失败");
+ throw new RuntimeException("修改隐患附属信息失败");
+ }
+
+ HiddenDangerCheckPoint hdcp = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
+ int confirmResult = confirmLogService.saveConfirmLog(hdcp);
+ if (confirmResult < 1){
+ return AjaxResult.error("操作失败");
}
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
+
return toAjax(i);
}
@@ -195,6 +280,14 @@
public String detailDangerExamine(@PathVariable("id") Long id, ModelMap mmap) {
//隐患排查实体
HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
+ PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hiddenDangerCheckPoint.getId());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ hiddenDangerCheckPoint.setHazardCode(dangerInfo.getHazardCode());
+ hiddenDangerCheckPoint.setDangerSrc(dangerInfo.getDangerSrc());
+ hiddenDangerCheckPoint.setDangerReason(dangerInfo.getDangerReason());
+ hiddenDangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType());
+ hiddenDangerCheckPoint.setDangerResult(dangerInfo.getDangerResult());
+ }
mmap.put("hdcp", hiddenDangerCheckPoint);
return prefix + "/detailDangerExamine";
}
--
Gitblit v1.9.2