From 56c84cd7fb04407536eb0135162313029828a81f Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期一, 11 十二月 2023 10:14:41 +0800 Subject: [PATCH] 暂时提交 --- src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java index e376eca..d1b446f 100644 --- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java +++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java @@ -8,6 +8,7 @@ import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo; import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO; 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; @@ -57,6 +58,9 @@ @Autowired private RiskService riskService; + + @Autowired + private PreventRiskDangerConfirmLogService confirmLogService; @GetMapping() public String hiddenDangerCheck(ModelMap mmap) { @@ -276,7 +280,6 @@ hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查) } } - //2.全流程隐患提交信息封装-未操作 //隐患核查 @@ -292,7 +295,6 @@ } } - //3.全流程隐患核查信息封装-未操作 //隐患整改 // hdcp.setRectifyCreateTime(DateUtils.getNowDate());//设置整改时间 @@ -340,11 +342,6 @@ - - - - - /** * 修改隐患上报 */ @@ -354,11 +351,13 @@ // todo-2022 修改前查询 PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hdcp.getId()); - hdcp.setHazardCode(dangerInfo.getHazardCode()); - hdcp.setDangerSrc(dangerInfo.getDangerSrc()); - hdcp.setDangerReason(dangerInfo.getDangerReason()); - hdcp.setHazardDangerType(dangerInfo.getHazardDangerType()); - hdcp.setDangerResult(dangerInfo.getDangerResult()); + if (ObjectUtils.isNotEmpty(dangerInfo)){ + hdcp.setHazardCode(dangerInfo.getHazardCode()); + hdcp.setDangerSrc(dangerInfo.getDangerSrc()); + hdcp.setDangerReason(dangerInfo.getDangerReason()); + hdcp.setHazardDangerType(dangerInfo.getHazardDangerType()); + hdcp.setDangerResult(dangerInfo.getDangerResult()); + } mmap.put("hiddenDangerCheckPoint", hdcp); @@ -471,6 +470,11 @@ } int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); + int result = confirmLogService.saveConfirmLog(hiddenDangerCheckPoint); + if (result < 1){ + return AjaxResult.error("操作失败"); + } + hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 return toAjax(i); -- Gitblit v1.9.2