From e98eeaaa5766511fdb8e6d5e412eb1c59d1f07ce Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期二, 24 六月 2025 10:24:43 +0800 Subject: [PATCH] 隐患来源功能外加仓吉基础数据定时上报 --- src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 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 0674dc4..40d366b 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 @@ -6,6 +6,7 @@ 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; @@ -122,7 +123,7 @@ } /** - * 隐患核查--核查 + * 隐患核查--下一个核查人 */ @Log(title = "隐患核查--核查") @GetMapping("/editNextConfirm/{id}") @@ -147,6 +148,7 @@ */ @Log(title = "隐患核查--下一个核查人") @PostMapping("/editNextConfirmSave") + @ResponseBody public AjaxResult editNextConfirmSave(HiddenDangerCheckPoint hdcp) { //获取当前更新用户信息 User sysUser = getSysUser(); @@ -154,10 +156,6 @@ 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不能为空"); @@ -166,14 +164,11 @@ if(ObjectUtils.isEmpty(hdcp.getExamineUserName())){ return AjaxResult.error("核查人姓名不能为空"); } - // examine_opinion 意见 -// if(ObjectUtils.isEmpty(hdcp.getRectifyDeadlineTime())){ -// return AjaxResult.error("核查意见不能为空"); -// } int i = confirmLogService.saveConfirmLog(hdcp); if (i < 1){ return AjaxResult.error("操作失败"); } + return toAjax(i); } @@ -210,7 +205,7 @@ //获取当前更新用户信息 User sysUser = getSysUser(); - // todo-2023 此处最终核查 + // todo-2024 hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName()); hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate()); hiddenDangerCheckPoint.setExamineCreateTime(DateUtils.getNowDate());//设置核查时间 @@ -229,12 +224,12 @@ 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("添加隐患附属信息失败"); - } +// int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint); +// if (result< 1){ +// throw new RuntimeException("添加隐患附属信息失败"); +// } HiddenDangerCheckPoint hdcp = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId()); int confirmResult = confirmLogService.saveConfirmLog(hdcp); @@ -278,6 +273,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