From 4711623a62f43b77187511e8ad2b41212f97bfa0 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Sun, 27 Apr 2025 21:09:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A1=E8=A7=86=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BC=BA=E9=99=B7=EF=BC=8C=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultAnalysisController.java | 8 ++++---- .../mapper/task/ResultAnalysisMapper.xml | 16 ++++------------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java index 4f1b6e8..33e332a 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java @@ -528,8 +528,8 @@ public class ResultAnalysisController extends BaseController { ResultAnalysis resultAnalysis = new ResultAnalysis(); resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId()); resultAnalysis.setFilter(patrolTaskStatus.getFilter()); - resultAnalysis.setResCode("2000"); - resultAnalysis.setPointStatus("0"); +// resultAnalysis.setResCode("2000"); +// resultAnalysis.setPointStatus("0"); resultAnalysis.setResultType("0"); // 0缺陷 startPage(); List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); @@ -642,8 +642,8 @@ public class ResultAnalysisController extends BaseController { resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId()); startPage(); resultAnalysis.setFilter(patrolTaskStatus.getFilter()); - resultAnalysis.setResCode("2000"); - resultAnalysis.setPointStatus("0"); +// resultAnalysis.setResCode("2000"); +// resultAnalysis.setPointStatus("0"); resultAnalysis.setResultType("2"); // 2异常 resultAnalysis.setPosType(patrolTaskStatus.getPosType()); List list = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml index f881f3c..0878b7f 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml @@ -552,10 +552,8 @@ FROM result_analysis a WHERE - a.res_code = '2000' - AND a.result_type = '0' + a.result_type = '0' AND a.filter = '1' - AND a.point_status = '0' AND a.task_patrol_id = #{taskPatrolledId} ) csQxNum, ( @@ -564,10 +562,8 @@ FROM result_analysis a WHERE - a.res_code = '2000' - AND a.result_type = '0' + a.result_type = '0' AND a.filter = '0' - AND a.point_status = '0' AND a.task_patrol_id = #{taskPatrolledId} ) aiQxNum, ( @@ -576,9 +572,7 @@ FROM result_analysis a WHERE - a.res_code = '2000' - AND a.result_type = '2' - AND a.point_status = '0' + a.result_type = '2' AND a.filter = '1' AND a.task_patrol_id = #{taskPatrolledId} ) csYcNum, @@ -588,9 +582,7 @@ FROM result_analysis a WHERE - a.res_code = '2000' - AND a.result_type = '2' - AND a.point_status = '0' + a.result_type = '2' AND a.filter = '0' AND a.task_patrol_id = #{taskPatrolledId} ) aiYcNum