From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期二, 15 四月 2025 10:10:35 +0800 Subject: [PATCH] 优化每年专项数据获取 --- src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 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 d1b446f..608337a 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 @@ -162,6 +162,12 @@ @ResponseBody @Transactional public AjaxResult addDangerReportSave(HiddenDangerCheckPoint hdcp) { + if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){ + throw new RuntimeException("检查人不能为空"); + } + if (ObjectUtils.isEmpty(hdcp.getFindTime())){ + throw new RuntimeException("发现时间不能为空"); + } HiddenDangerCheck hiddenDangerCheck = new HiddenDangerCheck(); hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者 hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间 @@ -234,7 +240,12 @@ HiddenDangerCheck hiddenDangerCheck = new HiddenDangerCheck(); // hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者 // hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间 - + if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){ + throw new RuntimeException("检查人不能为空"); + } + if (ObjectUtils.isEmpty(hdcp.getFindTime())){ + throw new RuntimeException("发现时间不能为空"); + } hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者 hiddenDangerCheck.setCreateTime(hdcp.getRectifyCreateTime());//获取创建时间 @@ -441,7 +452,6 @@ /** * 修改判定隐患上报保存 - * todo-2022 隐患核查(判定隐患) 以判定的隐患,才需要上报 */ @Log(title = "修改判定隐患上报保存", businessType = BusinessType.UPDATE) @PostMapping("/editJudgeDangerReportSave") @@ -460,7 +470,7 @@ 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("整改信息保存失败"); -- Gitblit v1.9.2