From f3616858ce4022f931748b09a6fefae2767dd18b Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Fri, 16 Aug 2024 11:22:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=80=E6=9F=A5=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/CheckReportManager.java | 5 ++++ .../system/check/TdCheckResultController.java | 6 ++--- .../mapper/check/TdCheckReportMapper.java | 3 +++ .../service/check/TdCheckReportService.java | 2 ++ .../check/impl/TdCheckReportServiceImpl.java | 5 ++++ .../mapper/system/TdCheckReportMapper.xml | 23 ++++++++++++++++++- 6 files changed, 39 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java index 6d1e048..3fe315a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java @@ -44,6 +44,11 @@ public class CheckReportManager { return checkReportService.selectTdCheckReportList(tdCheckReport); } + + public List selectTdCheckResultList(TdCheckReport tdCheckReport) { + return checkReportService.selectTdCheckResultList(tdCheckReport); + } + @Transactional(rollbackFor = Exception.class) public boolean saveOrUpdate(TdCheckReportDTO checkReportDTO) { TdCheckReport tdCheckReport = Convert.convert(TdCheckReport.class, checkReportDTO); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java index 6b86ae8..035cb18 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/TdCheckResultController.java @@ -7,11 +7,9 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.TdCheck; import com.ruoyi.system.domain.check.TdCheckReport; import com.ruoyi.system.domain.check.TdCheckType; import com.ruoyi.system.domain.check.dto.TdCheckReportDTO; -import com.ruoyi.system.service.ITdCheckService; import com.ruoyi.system.service.check.TdCheckTypeService; import com.ruoyi.web.controller.manager.CheckReportManager; import com.ruoyi.web.controller.manager.SysAreaManager; @@ -52,7 +50,7 @@ public class TdCheckResultController extends BaseController { @ResponseBody public TableDataInfo list(TdCheckReport tdCheckReport) { startPage(); - List tdCheckReports = checkReportManager.selectTdCheckReportList(tdCheckReport); + List tdCheckReports = checkReportManager.selectTdCheckResultList(tdCheckReport); return getDataTable(tdCheckReports); } @@ -64,7 +62,7 @@ public class TdCheckResultController extends BaseController { @PostMapping("/export") @ResponseBody public AjaxResult export(TdCheckReport tdCheckReport) { - List tdCheckReports = checkReportManager.selectTdCheckReportList(tdCheckReport); + List tdCheckReports = checkReportManager.selectTdCheckResultList(tdCheckReport); tdCheckReports.forEach(tdCheck1 -> { tdCheck1.setFramework(sysAreaManager.getAreaName(tdCheck1.getFramework())); tdCheck1.setArea(sysAreaManager.getAreaName(tdCheck1.getArea())); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/check/TdCheckReportMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/check/TdCheckReportMapper.java index fd24b15..0d3477a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/check/TdCheckReportMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/check/TdCheckReportMapper.java @@ -18,6 +18,9 @@ public interface TdCheckReportMapper extends BaseMapper { public List selectTdCheckReportList(TdCheckReport tdCheckReport); + + public List selectTdCheckResultList(TdCheckReport tdCheckReport); + public CheckResultCountDTO selectResultCount(); public CheckTypeCountDTO selectTypeCount(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/check/TdCheckReportService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/check/TdCheckReportService.java index 51deb2e..d9db7b4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/check/TdCheckReportService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/check/TdCheckReportService.java @@ -18,6 +18,8 @@ public interface TdCheckReportService extends IService { public List selectTdCheckReportList(TdCheckReport tdCheckReport); + public List selectTdCheckResultList(TdCheckReport tdCheckReport); + public CheckResultCountDTO selectResultCount(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java index db05a79..d99dbba 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/check/impl/TdCheckReportServiceImpl.java @@ -29,6 +29,11 @@ public class TdCheckReportServiceImpl extends ServiceImpl selectTdCheckResultList(TdCheckReport tdCheckReport) { + return checkReportMapper.selectTdCheckResultList(tdCheckReport); + } + @Override public CheckResultCountDTO selectResultCount() { return checkReportMapper.selectResultCount(); diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml index 07de971..afd0eab 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml @@ -34,11 +34,32 @@ AND framework = #{framework} - AND checkState = #{checkState} + AND check_state = #{checkState} AND depart = #{depart} + AND (check_type = '0' or check_type is null) + + ORDER BY create_time DESC + + +