From ef1fe7f67a9d7d4c94933c0a993e2d9639620239 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 06 九月 2023 13:19:28 +0800
Subject: [PATCH] d多人核查，隐患检索部分改动
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 71 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 3 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..db81ca5 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,9 @@
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.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 +20,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 +53,8 @@
@Autowired
JpushService jpushService;
+ @Autowired
+ private PreventRiskDangerConfirmLogService confirmLogService;
@Autowired
private RiskService riskService;
@@ -87,6 +93,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 +112,51 @@
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("/nextConfirm")
+ public AjaxResult nextConfirm(HiddenDangerCheckPoint hdcp) {
+
+ if(ObjectUtils.isEmpty(hdcp.getId())){
+ return AjaxResult.error("id不能为空");
+ }
+ // report_status , 上报判定结果(0未判定 1不是隐患 2是隐患）
+// if(ObjectUtils.isEmpty(hdcp.getReportStatus())){
+// return AjaxResult.error("判定结果不能为空");
+// }
+ // examine_user_id , 核查人id
+ if(ObjectUtils.isEmpty(hdcp.getExamineUserId())){
+ return AjaxResult.error("核查人Id不能为空");
+ }
+ // examine_user_name
+ if(ObjectUtils.isEmpty(hdcp.getExamineUserName())){
+ return AjaxResult.error("核查人姓名不能为空");
+ }
+ // examine_opinion 意见
+// if(ObjectUtils.isEmpty(hdcp.getRectifyDeadlineTime())){
+// return AjaxResult.error("核查意见不能为空");
+// }
+
+
+// 原数据表，现在不做操作
+// int i = hiddenDangerCheckPointService.(hcdp);
+
+ int i = confirmLogService.saveConfirmLog(hdcp);
+ if (i < 1){
+ return AjaxResult.error("操作失败");
+ }
+ return AjaxResult.success();
}
/**
@@ -127,6 +183,7 @@
/**
* 隐患核查--保存
+ *
*/
@Log(title = "隐患核查--保存", businessType = BusinessType.UPDATE)
@PostMapping("/editDangerExamineSave")
@@ -134,6 +191,8 @@
public AjaxResult editDangerExamineSave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
//获取当前更新用户信息
User sysUser = getSysUser();
+
+ // todo-2023 此处最终核查
hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName());
hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());
hiddenDangerCheckPoint.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间
@@ -152,15 +211,21 @@
if(hiddenDangerCheckPoint.getRectifyDeadlineTime()!=null) {
rectifyRemindJPush(hiddenDangerCheckPoint);
}
-
- // todo-2022 此处插入附属表
-// HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
+ //此处插入隐患附属表
+ //HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint);
if (result< 1){
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);
}
--
Gitblit v1.9.2