From 24d3def5fd8dc526ce9439449d2725b529e394f2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseSuperviseMapper.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseSuperviseMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseSuperviseMapper.java
index 945a307..cfe9b6d 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseSuperviseMapper.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseSuperviseMapper.java
@@ -63,18 +63,17 @@
 
     /**
      * 按条件查询实体总数
-     * @param caseId 查询条件集合
-     *  @param caseId 事项ID
+     * @param terms 条件
      */
-    long countCaseSupervise(@Param("caseId") String caseId, @Param("supStatus") int supStatus, @Param("quiltUnitId") String quiltUnitId);
+    long countCaseSupervise(@Param("terms") Map<String, Object> terms);
 
     /**
      * 根据事项ID分页查询
      * @param page 分页对象
-     * @param caseId 事项ID
+     * @param terms 条件
      * @return List<CaseSupervise>
      */
-    List<CaseSupervise> pageCaseSupervise(@Param("caseId") String caseId, @Param("page") PageRequest page, @Param("supStatus") int supStatus, @Param("quiltUnitId") String quiltUnitId);
+    List<CaseSupervise> pageCaseSupervise(@Param("terms") Map<String, Object> terms, @Param("page") PageRequest page);
 
     /**
      * 首页督办条件统计

--
Gitblit v1.8.0