From fc468a1c83be3997f9a7f32c6f61bc2795594579 Mon Sep 17 00:00:00 2001
From: 郑永安 <zyazyz250@sina.com>
Date: 星期一, 03 七月 2023 14:15:39 +0800
Subject: [PATCH] 版本上传异常修复
---
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 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 089841f..54b89ea 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -481,7 +481,6 @@
controlMeasure.setCreateByUserName(sysUser.getUserName());
controlMeasure.setRiskEventUuid(riskEvent.getUuid());
- //todo 对所属企业id和uuid没有进行设置
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
//设置上报时间为空
controlMeasure.setReportTime(null);
@@ -815,7 +814,7 @@
jobAndMeasure.setJobId(jobId);
jobAndMeasure.setJobUuid(jobUuid);
jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId());
- jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//todo 如果删除了措施 此处可能为空，后续处理
+ jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空，后续处理
//获取上报主配置信息
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
//设置上报时间为空
@@ -877,7 +876,7 @@
//使用保存下来的uuid，再次添加关联关系
jobAndMeasure.setJobUuid(jobUuid);
jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId());
- jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//todo 如果删除了措施 此处可能为空，后续处理
+ jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空，后续处理
//获取上报主配置信息
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
@@ -1047,21 +1046,21 @@
dangerInfo.setDangerReason(hdcp.getDangerReason());
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());
-// }
- dangerInfo.setDangerState(null); //设置为 空
+ //隐患状态 0未验收 1验收通过 2验收未通过
+ if (hdcp.getAcceptStatus() == null){
+ //设置为 空
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
+ } 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());
@@ -1278,7 +1277,6 @@
return listQueryRespDTOs;
}
-
/**
* 管控措施-不分页查询
*/
@@ -1298,6 +1296,7 @@
ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
return resultVO;
}
+
/**
* 通过排查点，查找管控措施id
*/
@@ -1305,6 +1304,7 @@
public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {
return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
}
+
/**
* 查询管控措施信息
*/
@@ -1326,8 +1326,23 @@
PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);
return dangerInfobyHiddenDangerId;
}
+
+ @Override
+ public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {
+ return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());
+ }
+
+
+
+
+
+
+
+
+
+
// /**
-// * 全流程隐患上报-附属表信息插入
+// * 全流程 隐患上报-附属表信息插入
// * */
// @Override
// public int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {
@@ -1369,4 +1384,6 @@
//
// return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
// }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.2