双重预防项目-国泰新华二开定制版
16639036659
2022-10-11 7e8d51b6a2d2892c8eca2c8cefd91f7d1b6f8f40
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
@@ -135,7 +135,7 @@
    /**
     * 新增保存隐患上报
     * todo-2022 隐患上报   需要检查对分别对两张表做了什么,然后添加附属表(tr_hidden_danger_check_point)
     * todo-2022 隐患上报   tr_hidden_danger_check_point
     */
    @Log(title = "隐患上报", businessType = BusinessType.INSERT)
    @PostMapping("/addDangerReportSave")
@@ -164,7 +164,6 @@
        if (i< 1){
            throw new RuntimeException("添加隐患信息失败");
        }
        // todo-2022 此处插入附属表
        //获取Id返回值
@@ -209,6 +208,7 @@
    @Log(title = "隐患上报全流程", businessType = BusinessType.INSERT)
    @PostMapping("/addDangerReportWholeProcessSave")
    @ResponseBody
    @Transactional
    public AjaxResult addDangerReportWholeProcessSave(HiddenDangerCheckPoint hdcp) {
        //新增隐患上报
        HiddenDangerCheck hiddenDangerCheck  = new HiddenDangerCheck();
@@ -223,6 +223,9 @@
        hiddenDangerCheck.setDangerPlaceId(hdcp.getDangerPlaceId());
        hiddenDangerCheck.setDangerPlaceName(hdcp.getDangerPlaceName());
        hiddenDangerCheckService.insertHiddenDangerCheck(hiddenDangerCheck);//构造隐患排查对象保存,主要保存隐患责任部门,隐患地点
        // todo-2022 1.全流程隐患上报信息封装
        hdcp.setCheckId(hiddenDangerCheck.getCheckId());
        hdcp.setCreateBy(ShiroUtils.getLoginName());//创建者
@@ -243,6 +246,7 @@
//        hdcp.setRegisterSubmitTime(DateUtils.getNowDate());//设置隐患上报提交时间
        //隐患上报判定
//        hdcp.setJudgeCreateTime(DateUtils.getNowDate());//设置隐患上报判定时间
        if (!StringUtils.isEmpty(hdcp.getReportStatus())) {
@@ -256,6 +260,7 @@
                hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
            }
        }
        // todo-2022 2.全流程隐患提交信息封装-未操作
        //隐患核查
@@ -271,11 +276,17 @@
            }
        }
        // todo-2022 3.全流程隐患核查信息封装-未操作
        //隐患整改
//        hdcp.setRectifyCreateTime(DateUtils.getNowDate());//设置整改时间
        hdcp.setRectifyStatus(TrHiddenDangerCheckConstants.RECTIFY_STATUS_ALREADY_RECTIFY);//整改状态(已整改)
        hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_NOT_ACCEPT);//验收状态(未验收)
        hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_ACCEPT);//隐患验收阶段(数据进入到隐患验收阶段)
        // todo-2022 4.全流程隐患整改信息封装-未操作
        //隐患验收
        if (!StringUtils.isEmpty(hdcp.getAcceptResult())) {
@@ -288,6 +299,9 @@
            } else if ("1".equals(hdcp.getAcceptResult())) {
//                hdcp.setAcceptCreateTime(DateUtils.getNowDate());//设置验收时间
                hdcp.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_ALREADY_ACCEPT_PASS);//验收状态(验收通过)
                // todo-2022 5.全流程隐患验收信息封装-未操作
            }
        }
        hdcp.setCompanyId(getSysUser().getCompanyId());
@@ -296,6 +310,14 @@
        hdcp.setUpdateTime(hdcp.getAcceptCreateTime());
        int i = hiddenDangerCheckPointService.insertHiddenDangerCheckPoint(hdcp);
        // todo-2022 全流程隐患附属信息插入
        //获取返回值id
        hdcp.getId();
        int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
        if (result < 1){
            throw new RuntimeException("全流程隐患信息保存失败");
        }
        return toAjax(i);
    }
@@ -396,11 +418,12 @@
    /**
     * 修改判定隐患上报保存
     * todo-2022 隐患核查(判定隐患) 以判定的隐患,才需要上报; 此处暂时不改动
     * todo-2022 隐患核查(判定隐患) 以判定的隐患,才需要上报
     */
    @Log(title = "修改判定隐患上报保存", businessType = BusinessType.UPDATE)
    @PostMapping("/editJudgeDangerReportSave")
    @ResponseBody
    @Transactional
    public AjaxResult editJudgeDangerReportSave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
        hiddenDangerCheckPoint.setJudgeCreateTime(DateUtils.getNowDate());//设置隐患上报判定时间
        if (!StringUtils.isEmpty(hiddenDangerCheckPoint.getReportStatus())) {
@@ -413,10 +436,19 @@
                hiddenDangerCheckPoint.setDangerLevel("0");//默认设置为一般隐患
                hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//隐患核查阶段(数据进入到隐患核查阶段)
                hiddenDangerCheckPoint.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
                // todo-2022 隐患信息判定
                int result = riskService.updateDangerInfoJudge(hiddenDangerCheckPoint);
                if (result < 1){
                    throw new RuntimeException("整改信息保存失败");
                }
            }
        }
        int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
        hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
        return toAjax(i);
    }