From 2ccbb8881721a16ec5cf68b12346ecdc0b6941cf Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: Sun, 09 Oct 2022 09:10:00 +0800
Subject: [PATCH] 获取所有的风险分析单元的编码和姓名
---
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 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 0e713b2..e9aa466 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.doublePrevention.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.ruoyi.common.utils.StringUtils;
@@ -1023,6 +1022,7 @@
dangerInfo.setDangerSrc(hdcp.getDangerSrc());
dangerInfo.setDangerDesc(hdcp.getDangerDesc());
dangerInfo.setDangerReason(hdcp.getDangerReason());
+ dangerInfo.setDangerResult(hdcp.getDangerResult());
dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
dangerInfo.setDangerState(hdcp.getDangerState());
dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
@@ -1064,6 +1064,7 @@
dangerInfo.setDangerSrc(hdcp.getDangerSrc());
dangerInfo.setDangerDesc(hdcp.getDangerDesc());
dangerInfo.setDangerReason(hdcp.getDangerReason());
+ dangerInfo.setDangerResult(hdcp.getDangerResult());
dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
dangerInfo.setDangerState(hdcp.getDangerState());
dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
@@ -1097,4 +1098,55 @@
return preventRiskDangerInfoService.deleteDangerInfo(id);
}
+
+ /**
+ * 隐患整改信息 - 修改
+ */
+ @Override
+ public int updateDangerInfoRectify(HiddenDangerCheckPoint hdcp) {
+
+ //封装修改数据
+ PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+
+ dangerInfo.setDangerCheckPointId(hdcp.getId());
+ //需要根据条件，判断附属表隐患状态。
+ // 目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；整改后的隐患-9已验收。2,3状态暂时未使用
+
+ dangerInfo.setDangerState(hdcp.getDangerState());
+ dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+ //设置本条数据上报更新时间
+ dangerInfo.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ return 0;
+ }
+
+ /**
+ * @description 获取所有的风险分析单元的编码和姓名
+ */
+ @Override
+ public List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName() {
+ List<PreventRiskList> riskLists = preventRiskListService.listRiskUnitCodeAndName();
+ List<PreventRiskUnitCodeAndNameListQueryRespDTO> listQueryRespDTOs= riskLists.stream().map((riskList)->{
+ PreventRiskUnitCodeAndNameListQueryRespDTO listQueryRespDTO = new PreventRiskUnitCodeAndNameListQueryRespDTO();
+ BeanUtils.copyProperties(riskList,listQueryRespDTO);
+ return listQueryRespDTO;
+ }).collect(Collectors.toList());
+ return listQueryRespDTOs;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.2