From 73d5cb4c8b3def02dda3addb09469713cc878ba1 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Tue, 06 Jun 2023 08:53:33 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
index f41c0fd..089841f 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -281,11 +281,11 @@
resultVO.setMsg("安全风险分析单元名称不能为空");
return resultVO;
}
- PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
- if (riskUnit == null){
- resultVO.setMsg("安全风险分析单元名称不存在");
- return resultVO;
- }
+// PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
+// if (riskUnit == null){
+// resultVO.setMsg("安全风险分析单元名称不存在");
+// return resultVO;
+// }
if (StringUtils.isEmpty(riskEventName)){
resultVO.setMsg("安全风险事件名称不能为空");
return resultVO;
@@ -369,7 +369,7 @@
*/
@Override
public ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO) {
- Integer pageIndex = riskEventQueryReqDTO.getPageIndex();
+ Integer pageIndex = riskEventQueryReqDTO.getPageNum();
Integer pageSize = riskEventQueryReqDTO.getPageSize();
if (pageIndex == 0 || pageSize == 0){
return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
@@ -690,7 +690,7 @@
*/
@Override
public ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) {
- Integer pageIndex = measureQueryReqDTO.getPageIndex();
+ Integer pageIndex = measureQueryReqDTO.getPageNum();
Integer pageSize = measureQueryReqDTO.getPageSize();
if (pageIndex == 0 || pageSize == 0){
return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
@@ -851,6 +851,7 @@
@Transactional
@Override
public int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob) {
+
// 2、若有变更，需要预先读取jobAndMeasure的uuid，保存下来
PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(hiddenDangerCheckJob.getJobId());
String jobUuid = jobAndMeasureByJobId.getJobUuid();
@@ -943,7 +944,7 @@
PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();
dangerCheck.setUuid(dangerCheckUuid);
- dangerCheck.setCheckStatus(null);//
+ dangerCheck.setCheckStatus((byte) 2);//
dangerCheck.setCheckId(checkId);
dangerCheck.setJobId(hdc.getJobId());
//获取上报主配置信息
@@ -1047,19 +1048,20 @@
dangerInfo.setDangerResult(hdcp.getDangerResult());
dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
//隐患状态 0未验收 1验收通过 2验收未通过 ，新建时为空
- if (hdcp.getAcceptStatus() == null){
- //设置为 空
- dangerInfo.setDangerState(null);
- } else if (hdcp.getAcceptStatus().equals(0)){
- //设置为整改中
- dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- } else if (hdcp.getAcceptStatus().equals(1)) {
- //设置为已验收
- dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
- }else if (hdcp.getAcceptStatus().equals(2)){
- //设置为超期未整改
- dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
- }
+// if (hdcp.getAcceptStatus() == null){
+// //设置为 空
+// dangerInfo.setDangerState(null);
+// } else if (hdcp.getAcceptStatus().equals(0)){
+// //设置为整改中
+// dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
+// } else if (hdcp.getAcceptStatus().equals(1)) {
+// //设置为已验收
+// dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
+// }else if (hdcp.getAcceptStatus().equals(2)){
+// //设置为超期未整改
+// dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
+// }
+ dangerInfo.setDangerState(null); //设置为 空
dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
//获取上报主配置信息
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
@@ -1230,11 +1232,11 @@
PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
dangerInfo.setDangerCheckPointId(hdcp.getId());
-
+ int acceptStatus = Integer.parseInt(hdcp.getAcceptStatus());
//如果验收通过，设置为验收成功；验收失败，打回上一级进行整改，设置为整改中
- if (hdcp.getAcceptStatus().equals(0)){
+ if (acceptStatus == 0){
dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- }else if (hdcp.getAcceptStatus().equals(1)){
+ }else if (acceptStatus == 1){
dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
}
--
Gitblit v1.9.2