双重预防项目-国泰新华二开定制版
heheng
9 天以前 5746e59e622daa8ce62d0c29aaba9b8bd5308bcd
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,11 +224,18 @@
        if(hiddenDangerCheckPoint.getRectifyDeadlineTime()!=null) {
            rectifyRemindJPush(hiddenDangerCheckPoint);
        }
        //此处插入隐患附属表
        //此处插入隐患附属表   20250623 位置变更注释掉
        //HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
        int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint);
//        int result = riskService.insertDangerInfo(hiddenDangerCheckPoint.getId(), hiddenDangerCheckPoint);
//        if (result< 1){
//            throw new RuntimeException("添加隐患附属信息失败");
//        }
        //此处插入隐患附属表   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());
@@ -278,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";
    }