From 2da0fd01f975e3efdf26ffe7316ff5fcdb14044b Mon Sep 17 00:00:00 2001
From: wsm <2746563060@qq.com>
Date: Tue, 14 Jul 2026 16:45:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(dq):=20=E5=8F=B0=E8=B4=A6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0bpmStatus=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8DcompletedStage/measureCount?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E6=B1=A1=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../demo/dqinspecttask/controller/DqInspectTaskController.java | 2 ++
 .../demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml      | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java
index f570113..b663b57 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/controller/DqInspectTaskController.java
@@ -97,6 +97,8 @@ public class DqInspectTaskController extends JeecgController<DqInspectTask, IDqI
 	public Result<IPage<DqInspectTaskLedgerVo>> queryLedgerList(DqInspectTask dqInspectTask,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		dqInspectTask.setCompletedStage(null);
+		dqInspectTask.setMeasureCount(null);
 		Page<DqInspectTaskLedgerVo> page = new Page<DqInspectTaskLedgerVo>(pageNo, pageSize);
 		IPage<DqInspectTaskLedgerVo> pageList = service.queryLedgerPage(page, dqInspectTask);
 		return Result.OK(pageList);
diff --git a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml
index 069acf9..bba9dd6 100644
--- a/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml
+++ b/jeecg-module-supervision/src/main/java/org/jeecg/modules/demo/dqinspecttask/mapper/xml/DqInspectTaskMapper.xml
@@ -61,6 +61,9 @@
             <if test="task.completedStage != null and task.completedStage != ''">
                 and t.completed_stage = #{task.completedStage}
             </if>
+            <if test="task.bpmStatus != null and task.bpmStatus != ''">
+                and t.bpm_status = #{task.bpmStatus}
+            </if>
         </if>
         order by
             p_category.sort_no asc,