From 76eaceb627cc08a2368e903b4e6ca366bc348010 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 17 六月 2024 14:18:34 +0800
Subject: [PATCH] 查询调整
---
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java | 5 +++++
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java | 12 +++++++-----
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java | 2 ++
src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml | 5 +++++
src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java | 2 ++
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java
index a119ee3..c7824e3 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java
@@ -24,4 +24,6 @@
List<TbSpecialCheckItemDangerLog> listItemDangerReportTask();
void updateItemDangerReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
+
+ TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogById(String id);
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java
index 879d061..2b46e42 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java
@@ -20,4 +20,6 @@
ResultVO<TbSpecialCheckItemDangerLog> updateSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLogUpdateBO updateBO);
ResultVO<TbSpecialCheckItemDangerLog> deleteTbSpecialItemDangerTaskLog(TbSpecialCheckItemDangerLogUpdateBO updateBO);
+
+ TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogById(String id);
}
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 d31ad78..b8958ba 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
@@ -292,5 +292,10 @@
return resultVO;
}
+ @Override
+ public TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogById(String id) {
+ return itemDangerLogMapper.getSpecialCheckItemDangerLogById(id);
+ }
+
}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java
index 39be01a..ff82973 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java
@@ -5,15 +5,13 @@
import com.ruoyi.doublePrevention.enums.ErrorCodes;
import com.ruoyi.doublePrevention.enums.ResultCodes;
import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.specialCheck.domin.*;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckItemBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
import com.ruoyi.project.tr.specialCheck.mapper.*;
+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;
@@ -33,6 +31,8 @@
private TbBaseCheckTaskMapper taskTbRepository;
@Autowired
private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
+ @Autowired
+ private SpecialCheckItemDangerLogService itemDangerLogService;
@Override
public ResultVO<List<TbBaseCheckTask>> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO) {
@@ -93,8 +93,10 @@
if (pageIndex == 0 || pageSize == 0){
return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
}
-
+ TbSpecialCheckItemDangerLog specialCheckItemDangerLogById = itemDangerLogService.getSpecialCheckItemDangerLogById(tbBaseCheckScoreBO.getId());
Page<TbBaseCheckScore> page = PageHelper.startPage(pageIndex, pageSize);
+
+ tbBaseCheckScoreBO.setCheckItemId(specialCheckItemDangerLogById.getCheckItemId());
scoreTbRepository.selectTbBaseCheckScorePage(tbBaseCheckScoreBO);
Long total = page.getTotal();
diff --git a/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml b/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
index 6e930bb..04608a2 100644
--- a/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
+++ b/src/main/resources/mybatis/tr/TbSpecialCheckItemDangerLogMapper.xml
@@ -234,4 +234,9 @@
report_time = #{reportTime}
where id = #{indexId} and deleted = 0
</update>
+<!-- TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogById(String id);-->
+ <select id="getSpecialCheckItemDangerLogById" resultMap="BaseResultMap">
+ select * from tb_special_check_item_danger_log
+ where deleted = 0 and id = #{id}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.2