From 3b40ef10054199c386b0d58d03424182a33b5043 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 13 七月 2023 08:57:51 +0800
Subject: [PATCH] 添加风险单元名称
---
src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java | 2 ++
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java | 26 +++++++++++++++++---------
src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java | 5 +++++
src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java | 2 ++
src/main/resources/mybatis/tr/RiskListMapper.xml | 5 +++++
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java | 5 +++++
6 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java
index a104ec4..5e49812 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java
@@ -27,6 +27,11 @@
* 修改人
*/
private String lastEditUserName;
+
+ /**
+ * 所属安全风险分析单元
+ */
+ private String riskUnitName;
/**
* 所属安全风险分析单元id
*/
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
index cdf3c5f..b0574dd 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
@@ -19,6 +19,8 @@
import com.ruoyi.doublePrevention.service.baseService.PreventReportConfigService;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.tr.riskList.domain.RiskList;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -36,6 +38,8 @@
private PreventOverhaulLogRepository overhaulLogRepository;
@Autowired
private PreventReportConfigService preventReportConfigService;
+ @Autowired
+ private IRiskListService iRiskListService;
@Override
@@ -56,7 +60,18 @@
List<PreventOverhaulLog> preventOverhaulLogs = overhaulLogRepository.selectOverhaulLogPage(overhaulLogReqBO);
List<PreventOverhaulLog> result = page.getResult();
- resultVO.setData(result);
+ List<PreventOverhaulLogRespDTO> preventOverhaulLogRespDTOS = BeanCopyUtils.copyBeanList(result, PreventOverhaulLogRespDTO.class);
+
+ List<RiskList> riskUnitLists = iRiskListService.getRiskUnitLists();
+ for (PreventOverhaulLogRespDTO overhaulLog : preventOverhaulLogRespDTOS) {
+ for (RiskList riskUnit : riskUnitLists) {
+ if (overhaulLog.getRiskUnitId() == riskUnit.getRiskListId()){
+ overhaulLog.setRiskUnitName(riskUnit.getRiskListName());
+ }
+ }
+ }
+
+ resultVO.setData(preventOverhaulLogRespDTOS);
resultVO.setCount((int) page.getTotal());
resultVO.setPageNum(page.getPageNum());
resultVO.setPageSize(page.getPageSize());
@@ -71,9 +86,7 @@
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-// if (insertReqBO.getHazardCode().isEmpty()){
-// throw new RuntimeException("风险分析对象编码为空");
-// }
+
if (ObjectUtils.isEmpty(insertReqBO.getRiskUnitId())){
throw new RuntimeException("安全风险分析单元为空");
}
@@ -98,7 +111,6 @@
preventOverhaulLog.setGmtCreate(date);
preventOverhaulLog.setLastEditUserName(sysUser.getUserName());
preventOverhaulLog.setGmtModitify(date);
- preventOverhaulLog.setRiskUnitId(null);// todo 暂时未设置
//todo 对所属企业id和uuid没有进行设置
PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
@@ -149,10 +161,6 @@
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- if (updateReqBO.getHazardCode().isEmpty()){
- resultVO.setMsg("风险分析对象编码");
- return resultVO;
- }
if (ObjectUtils.isEmpty(updateReqBO.getRiskUnitId())){
resultVO.setMsg("所属安全风险分析单元");
return resultVO;
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java b/src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java
index 961fbba..0d24a10 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java
@@ -81,4 +81,6 @@
* 获取风险清单信息
*/
RiskList getInfoByRiskListId(Long riskUnitId);
+
+ List<RiskList> getRiskUnitLists();
}
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java b/src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java
index 5ab834b..d8eec4a 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java
@@ -81,4 +81,6 @@
* 获取风险清单信息
*/
RiskList getInfoByRiskListId(Long riskUnitId);
+
+ List<RiskList> getRiskUnitLists();
}
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java b/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java
index a04018c..3fdf876 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java
@@ -157,4 +157,9 @@
public RiskList getInfoByRiskListId(Long riskUnitId) {
return riskListMapper.getInfoByRiskListId(riskUnitId);
}
+
+ @Override
+ public List<RiskList> getRiskUnitLists() {
+ return riskListMapper.getRiskUnitLists();
+ }
}
diff --git a/src/main/resources/mybatis/tr/RiskListMapper.xml b/src/main/resources/mybatis/tr/RiskListMapper.xml
index 94cc607..b8d83dc 100644
--- a/src/main/resources/mybatis/tr/RiskListMapper.xml
+++ b/src/main/resources/mybatis/tr/RiskListMapper.xml
@@ -326,4 +326,9 @@
<select id="getInfoByRiskListId" parameterType="RiskList" resultMap="RiskListResult">
select * from tr_risk_list where risk_list_id = #{riskUnitId} and user_id is not null
</select>
+
+<!-- List<RiskList> getRiskUnitLists(); -->
+ <select id="getRiskUnitLists" parameterType="RiskList" resultMap="RiskListResult">
+ select * from tr_risk_list
+</select>
</mapper>
--
Gitblit v1.9.2