From 9015e720487b737743232b0b3aa464c2ac9e8d17 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期五, 15 十一月 2024 17:31:24 +0800
Subject: [PATCH] 修改请求地址
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
index cf7d7e7..12d0637 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
@@ -30,6 +30,7 @@
import com.ruoyi.project.tr.riskCheckPoint.service.IRiskCheckPointService;
import com.ruoyi.project.tr.riskEvaluationPlan.domain.RiskEvaluationPlan;
import com.ruoyi.project.tr.riskEvaluationPlan.service.IRiskEvaluationPlanService;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -150,12 +151,12 @@
}
hiddenDangerCheck.setScheduleCheckUserIdList(userIdList);//排查人为（本公司和子公司用户）userId的
startPage();
- List<HiddenDangerCheck> list = hiddenDangerCheckService.selectHiddenDangerCheckList(hiddenDangerCheck);
+ List<HiddenDangerCheck> list = hiddenDangerCheckService.selectHiddenDangerCheckListNew(hiddenDangerCheck);
return getDataTable(list);
}
startPage();
hiddenDangerCheck.setScheduleCheckUserId(getSysUser().getUserId());//排查人为本登录帐号userId的
- List<HiddenDangerCheck> list = hiddenDangerCheckService.selectHiddenDangerCheckList(hiddenDangerCheck);
+ List<HiddenDangerCheck> list = hiddenDangerCheckService.selectHiddenDangerCheckListNew(hiddenDangerCheck);
return getDataTable(list);
}
@@ -400,7 +401,7 @@
//是隐患设置核查人ID、核查人名称
if ((!StringUtils.isEmpty(hdcp.getWhetherDanger())) &&
(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES.equals(hdcp.getWhetherDanger()))) {
- hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
+ hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状8态(待核查)
hdcp.setExamineUserId(hiddenDangerCheck.getExamineUserId());//核查人ID
hdcp.setExamineUserName(hiddenDangerCheck.getExamineUserName());//核查人名称
hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//3隐患核查阶段(/** 更新者 */数据进入到3隐患核查阶段)
@@ -427,7 +428,9 @@
hiddenDangerCheckPoint.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_NOT);//是否为隐患(正常)
// hiddenDangerCheckPoint.setScheduleCheckStatus(TrHiddenDangerCheckConstants.CHECK_STATUS_ALREADY_CHECK);//排查状态(已排查)（定时任务生成的数据）
// hiddenDangerCheckPoint.setCheckTime(DateUtils.getNowDate());//设置排查时间
-
+ if(ObjectUtils.isEmpty(hiddenDangerCheckPoint.getMobileCode())){
+ throw new RuntimeException("手机识别码为空，请使用终端机进行填写");
+ }
int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
@@ -444,7 +447,9 @@
//隐患排查检查点实体
HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
mmap.put("hiddenDangerCheckPoint", hiddenDangerCheckPoint);
-
+ if(ObjectUtils.isEmpty(hiddenDangerCheckPoint.getMobileCode())){
+ throw new RuntimeException("手机识别码为空，请使用终端机进行填写");
+ }
//隐患类别
User sysUser = getSysUser();
HiddenTroubleType hiddenTroubleType = new HiddenTroubleType();
@@ -492,6 +497,9 @@
hiddenDangerCheckPoint.setUpdateTime(DateUtils.getNowDate());
i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
}
+ if(ObjectUtils.isEmpty(hiddenDangerCheckPoint.getMobileCode())){
+ throw new RuntimeException("手机识别码为空，请使用终端机进行填写");
+ }
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
return toAjax(i);
--
Gitblit v1.9.2