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/CaseTaskMapper.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
index f295539..b1d4bf8 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseTaskMapper.java
@@ -107,6 +107,13 @@
     List<FrontPageListQSDTO> pageMyTaskQs(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
 
     /**
+     * 全部签收-查询未签收所有Id
+     * @param terms 条件
+     * @return List<String>
+     */
+    List<SignTaskDTO> listIdByTerms(@Param("terms") Map<String, Object> terms);
+
+    /**
      * 首页-待/已受理条件统计
      * @param terms 条件
      * @return long
@@ -134,21 +141,36 @@
      * @param terms 条件
      * @return List<FrontPageListDTO>
      */
-    List<FrontPageListDTO> pageMyTaskShWSQD(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+    List<FrontPageListWSQDDTO> pageMyTaskShWSQD(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
 
     /**
-     * 首页-待审核条件统计
+     * 首页-办理中条件统计
      * @param terms 条件
      * @return long
      */
-    long countMyTaskProcessing(@Param("terms") Map<String, Object> terms);
+    long countMyTaskBlz(@Param("terms") Map<String, Object> terms);
 
     /**
-     * 首页-待审核分页查询
+     * 首页-办理中分页查询
      * @param page 分页对象
      * @param terms 条件
      * @return List<FrontPageListDTO>
      */
-    List<FrontPageListDTO> pageMyTaskProcessing(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+    List<FrontPageListBLZDTO> pageMyTaskBlz(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+
+    /**
+     * web端-工作台-已办事项条件统计
+     * @param terms 条件
+     * @return long
+     */
+    long countMyTaskYb(@Param("terms") Map<String, Object> terms);
+
+    /**
+     * web端-工作台-已办事项分页查询
+     * @param page 分页对象
+     * @param terms 条件
+     * @return List<FrontPageListDTO>
+     */
+    List<FrontPageListYBDTO> pageMyTaskYb(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
 
 }

--
Gitblit v1.8.0