From dcd669d0f4fad2e9292ee2ae8b2b55de98b1332c Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 24 Sep 2024 19:03:16 +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 | 24 +++++++++++++++++++-----
1 files changed, 19 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 da14e53..18e5139 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
@@ -1,5 +1,6 @@
package cn.huge.module.cases.dao.mapper;
+import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.CaseSupervise;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -63,18 +64,31 @@
/**
* 按条件查询实体总数
- * @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);
+
+ /**
+ * 首页督办条件统计
+ * @param terms 条件
+ */
+ long countMyTaskDb(@Param("terms") Map<String, Object> terms);
+
+ /**
+ * 首页督办分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return List<CaseSupervise>
+ */
+ List<FrontPageListDTO> pageMyTaskDb(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
/**
* 首页-督办数量
--
Gitblit v1.8.0