From 7d1e2e5640def6b283f76555681b0a3e62b2a338 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期四, 13 六月 2024 08:56:24 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java | 2
src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java | 2
src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml | 6 +
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java | 16 +++-
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java | 1
src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java | 2
src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml | 10 +++
src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml | 7 +
src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java | 2
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java | 2
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java | 72 ++++++++++++++++++++++--
src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml | 6 +
src/main/resources/mybatis/tr/RiskListMapper.xml | 3
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java | 5 -
14 files changed, 114 insertions(+), 22 deletions(-)
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 e3346e5..f597160 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
@@ -87,7 +87,7 @@
List<RiskList> getAllPlan(int riskType);
- ResultVO<List<RiskList>> listHazardSource();
+ List<RiskList> listHazardSource();
RiskList getInfoByRiskListNum(String hazardCode);
}
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 9d7f5e0..2ce81b7 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
@@ -87,7 +87,7 @@
List<RiskList> getAllPlan();
- ResultVO<List<RiskList>> listHazardSource();
+ List<RiskList> listHazardSource();
RiskList getInfoByRiskListNum(String hazardCode);
}
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 7232bde..f9764f3 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
@@ -173,7 +173,7 @@
}
@Override
- public ResultVO<List<RiskList>> listHazardSource() {
+ public List<RiskList> listHazardSource() {
return riskListMapper.listHazardSource();
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
index 73e84f3..aaff7cf 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.tr.specialCheck.controller;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -42,6 +44,9 @@
@Autowired
private TbBaseCheckService tbBaseCheckService;
+ @Autowired
+ private PreventCJReportDangerInfoService preventCJReportDangerInfoService;
+
@GetMapping()
@@ -66,20 +71,21 @@
}
/**
- * 新增任务
+ * 新增
*/
@GetMapping("/add")
public String add(ModelMap mmap)
{
- ResultVO<List<RiskList>> resultVO = riskListService.listHazardSource();
- Object data = resultVO.getData();
- mmap.put("hazardList", data);
+ List<RiskList> riskList = riskListService.listHazardSource();
+ List<PreventCJReportDangerInfo> dangerList = preventCJReportDangerInfoService.getDangerListForCheckTask();
+ mmap.put("hazardList", riskList);
+ mmap.put("dangerList", dangerList);
return prefix + "/add";
}
/**
- * 新增任务保存
+ * 新增保存
*/
@PostMapping("/add")
@ResponseBody
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
index 2b6b7cd..c4eba28 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
@@ -79,9 +79,8 @@
@GetMapping("/add")
public String add(ModelMap mmap)
{
- ResultVO<List<RiskList>> resultVO = riskListService.listHazardSource();
- Object data = resultVO.getData();
- mmap.put("hazardList", data);
+ List<RiskList> riskList = riskListService.listHazardSource();
+ mmap.put("hazardList", riskList);
return prefix + "/add";
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
index ca9e386..f7e6a81 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
@@ -13,4 +13,5 @@
List<TbBaseCheckItem> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO);
+ TbBaseCheckItem getBaseCheckItemByItemId(String checkItemId);
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
index 6659af3..14b93ae 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
@@ -11,4 +11,6 @@
public interface TbBaseCheckScoreMapper extends BaseMapper<TbBaseCheckScore> {
List<TbBaseCheckScore> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO);
+
+ TbBaseCheckScore getBaseCheckScoreByScoreId(String checkScoreId);
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
index 07469e8..b4810c1 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
@@ -11,4 +11,6 @@
public interface TbBaseCheckTaskMapper extends BaseMapper<TbBaseCheckTask> {
List<TbBaseCheckTaskMapper> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO);
+
+ TbBaseCheckTaskMapper getBaseCheckTaskByTaskId(String taskId);
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
index 20fa266..f8a4b92 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -2,17 +2,26 @@
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.enums.ErrorCodes;
import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
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.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckItemMapper;
+import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckScoreMapper;
+import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckTaskMapper;
import com.ruoyi.project.tr.specialCheck.mapper.TbSpecialCheckItemDangerLogMapper;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
+import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -28,6 +37,19 @@
@Autowired
private TbSpecialCheckItemDangerLogMapper itemDangerLogMapper;
+
+ @Autowired
+ private TbBaseCheckTaskMapper baseCheckTaskMapper;
+
+ @Autowired
+ private TbBaseCheckItemMapper baseCheckItemMapper;
+
+ @Autowired
+ private TbBaseCheckScoreMapper baseCheckScoreMapper;
+
+ @Autowired
+ private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
+
@Override
@@ -61,21 +83,40 @@
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- // 四类id，挨个查询，判断是否存在
+ if (itemDangerLog.getTaskId() == null){
+ resultVO.setMsg("任务不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId());
+ if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+ resultVO.setMsg("任务不存在");
+ return resultVO;
+ }
if (itemDangerLog.getCheckItemId() == null){
resultVO.setMsg("检查项不能为空");
return resultVO;
}
- if (itemDangerLog.getTaskId() == null){
- resultVO.setMsg("任务不能为空");
+ TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(itemDangerLog.getCheckItemId());
+ if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+ resultVO.setMsg("检查项不存在");
return resultVO;
}
if (itemDangerLog.getCheckScoreId() == null){
resultVO.setMsg("评分不能为空");
return resultVO;
}
+ TbBaseCheckScore baseCheckScoreByScoreId = baseCheckScoreMapper.getBaseCheckScoreByScoreId(itemDangerLog.getCheckScoreId());
+ if (ObjectUtils.isEmpty(baseCheckScoreByScoreId)){
+ resultVO.setMsg("评分标准不存在");
+ return resultVO;
+ }
if (itemDangerLog.getDangerId() == null){
resultVO.setMsg("关联隐患不能为空");
+ return resultVO;
+ }
+ PreventCJReportDangerInfo dangerById = preventCJReportDangerInfoRepository.getDangerById(itemDangerLog.getDangerId());
+ if (ObjectUtils.isEmpty(dangerById)){
+ resultVO.setMsg("隐患不存在");
return resultVO;
}
if (itemDangerLog.getCheckDate() == null){
@@ -122,23 +163,42 @@
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- // 四类id，挨个查询，判断是否存在
+ if (updateBO.getTaskId() == null){
+ resultVO.setMsg("任务不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId());
+ if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+ resultVO.setMsg("任务不存在");
+ return resultVO;
+ }
if (updateBO.getCheckItemId() == null){
resultVO.setMsg("检查项不能为空");
return resultVO;
}
- if (updateBO.getTaskId() == null){
- resultVO.setMsg("任务不能为空");
+ TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(updateBO.getCheckItemId());
+ if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+ resultVO.setMsg("检查项不存在");
return resultVO;
}
if (updateBO.getCheckScoreId() == null){
resultVO.setMsg("评分不能为空");
return resultVO;
}
+ TbBaseCheckScore baseCheckScoreByScoreId = baseCheckScoreMapper.getBaseCheckScoreByScoreId(updateBO.getCheckScoreId());
+ if (ObjectUtils.isEmpty(baseCheckScoreByScoreId)){
+ resultVO.setMsg("评分标准不存在");
+ return resultVO;
+ }
if (updateBO.getDangerId() == null){
resultVO.setMsg("关联隐患不能为空");
return resultVO;
}
+ PreventCJReportDangerInfo dangerById = preventCJReportDangerInfoRepository.getDangerById(updateBO.getDangerId());
+ if (ObjectUtils.isEmpty(dangerById)){
+ resultVO.setMsg("隐患不存在");
+ return resultVO;
+ }
if (updateBO.getCheckDate() == null){
resultVO.setMsg("检查时间不能为空");
return resultVO;
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
index 580b227..aab5eb3 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
@@ -77,4 +77,14 @@
, #{reportStatus}, #{reportTime}, #{dataSource}, #{dangerManagerId})
</insert>
+<!-- List<PreventCJReportDangerInfo> getDangerListForCheckTask();-->
+ <select id="getDangerListForCheckTask" resultMap="BaseResultMap">
+ select * from prevent_cj_report_danger_info
+ where hazard_code is not null and report_status = 2 and deleted = 0
+ </select>
+<!-- PreventCJReportDangerInfo getDangetById(String dangerId);-->
+ <select id="getDangerById" resultMap="BaseResultMap">
+ select * from prevent_cj_report_danger_info
+ where deleted = 0 and id = #{dangerId}
+ </select>
</mapper>
diff --git a/src/main/resources/mybatis/tr/RiskListMapper.xml b/src/main/resources/mybatis/tr/RiskListMapper.xml
index 40d85ed..966c6ec 100644
--- a/src/main/resources/mybatis/tr/RiskListMapper.xml
+++ b/src/main/resources/mybatis/tr/RiskListMapper.xml
@@ -387,7 +387,8 @@
<!-- ResultVO<List<RiskList>> listHazardSource();-->
<select id="listHazardSource" resultMap="RiskListResult">
SELECT * FROM tr_risk_list
- where risk_list_num is not null
+ where risk_list_num in('652310082001','652310082002','652310082003','652310082004','652310082005','652310082006',
+ '652310082007','652310082008','652310082009','652310082010','652310082011','652310082012','652310082013')
</select>
<!-- RiskList getInfoByRiskListNum(String hazardCode);-->
<select id="getInfoByRiskListNum" resultMap="RiskListResult">
diff --git a/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml b/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
index fca2240..0d4913c 100644
--- a/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
+++ b/src/main/resources/mybatis/tr/TbBaseCheckItemMapper.xml
@@ -38,5 +38,9 @@
order by create_date desc
</where>
</select>
-
+<!-- TbBaseCheckItem getBaseCheckItemByItemId(String checkItemId);-->
+ <select id="getBaseCheckItemByItemId" resultMap="BaseResultMap">
+ select * from tb_base_check_item
+ where id = #{checkItemId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml b/src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml
index 61a4df1..f9e35ce 100644
--- a/src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml
+++ b/src/main/resources/mybatis/tr/TbBaseCheckScoreMapper.xml
@@ -30,5 +30,9 @@
order by create_date desc
</where>
</select>
-
+<!-- TbBaseCheckScore getBaseCheckScoreByScoreId(String checkScoreId);-->
+ <select id="getBaseCheckScoreByScoreId" resultMap="BaseResultMap">
+ select * from tb_base_check_score
+ where id = #{checkScoreId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml b/src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml
index 0e15a78..ef3ecea 100644
--- a/src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml
+++ b/src/main/resources/mybatis/tr/TbBaseCheckTaskMapper.xml
@@ -35,7 +35,10 @@
order by create_date desc
</where>
</select>
-
-
+<!-- TbBaseCheckTaskMapper getBaseCheckTaskByTaskId(String taskId);-->
+ <select id="getBaseCheckTaskByTaskId" resultMap="BaseResultMap">
+ select * from tb_base_check_task
+ where id = #{taskId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.2