From 84f2afb80a67710522eab149b4076bd7200d610b Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 28 四月 2023 10:44:33 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java b/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
index aea4c26..e160f13 100644
--- a/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java
@@ -1,8 +1,12 @@
package com.ruoyi.project.tr.riskList.controller;
+import com.ruoyi.common.utils.BeanCopyUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskCheckUnitRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;
import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -30,7 +34,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
-import org.thymeleaf.spring5.processor.SpringErrorClassTagProcessor;
import java.util.ArrayList;
import java.util.Date;
@@ -46,6 +49,8 @@
@RequestMapping("/tr/riskList")
public class RiskListController extends BaseController {
private String prefix = "tr/riskList";
+
+
@Autowired
private IRiskListService riskListService;
@@ -201,7 +206,7 @@
int result = riskListService.insertRiskList(riskList);
riskList.getRiskListId();
-
+ //todo-2022
//新代码，为设施设备清单附属表添加uuid
int uuidResult = riskService.insertRiskUnitUuid(riskList.getRiskListId());
if (uuidResult < 0){
@@ -296,6 +301,7 @@
/**
* 修改保存风险清单
*/
+ @Transactional
@Log(title = "风险清单", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
@@ -303,7 +309,12 @@
User sysUser = getSysUser();
riskList.setUpdateBy(sysUser.getUserName());
riskList.setUpdateTime(DateUtils.getNowDate());
- return toAjax(riskListService.updateRiskList(riskList));
+ int result = riskListService.updateRiskList(riskList);
+
+ //todo-2022 新代码，附属表变更
+ riskService.updateRiskUnit(riskList.getRiskListId());
+
+ return toAjax(result);
}
/**
@@ -314,7 +325,12 @@
@ResponseBody
public AjaxResult remove(String ids) {
//删除风险清单的同时,删除评价计划,
- return toAjax(riskListService.deleteRiskListByIds(ids));
+ int result = riskListService.deleteRiskListByIds(ids);
+
+ //todo-2022 新代码，附属表变更
+ riskService.deleteRiskUnit(ids);
+
+ return toAjax(result);
}
/**
@@ -425,7 +441,22 @@
@ResponseBody
public TableDataInfo list(RiskList riskList) {
startPage();
- List<RiskList> list = riskListService.selectRiskListList(riskList);
+ List<RiskList> riskLists = riskListService.selectRiskListList(riskList);
+
+ List<PreventRiskCheckUnitRespDTO> list = new ArrayList<>();
+ //todo-2022 新代码，使用DTO,封装进去措施数据
+ for (RiskList risk : riskLists) {
+ PreventRiskCheckUnitRespDTO respDTO = BeanCopyUtils.copyBean(risk, PreventRiskCheckUnitRespDTO.class);
+
+ //查询封装管控措施
+ List<PreventRiskControlMeasure> riskControlMeasureList = riskService.getRiskControlMeasureByRiskId(risk.getRiskListId());
+ if (riskControlMeasureList != null && riskControlMeasureList.size() > 1){
+ respDTO.setRiskControlMeasures(riskControlMeasureList);
+ }
+
+ list.add(respDTO);
+ }
+
return getDataTable(list);
}
--
Gitblit v1.9.2