From b311ca2f01e9602c1bf8caab04b4d641b314e341 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 29 Sep 2024 12:48:09 +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/CaseWindupApplyMapper.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java
index 0272ecc..b8d6eb0 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/CaseWindupApplyMapper.java
@@ -1,7 +1,7 @@
 package cn.huge.module.cases.dao.mapper;
 
 import cn.huge.module.cases.domain.dto.FrontPageListDTO;
-import cn.huge.module.cases.domain.po.CaseAssistApply;
+import cn.huge.module.cases.domain.dto.FrontPageListJADTO;
 import cn.huge.module.cases.domain.po.CaseWindupApply;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -86,17 +86,17 @@
     List<FrontPageListDTO> listMyTaskApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
 
     /**
-     * 首页-待审核条件统计
+     * 首页-结案申请/已结案条件条件统计
      * @param terms 条件
      * @return long
      */
-    long countMySubmitApplyReview(@Param("terms") Map<String, Object> terms);
+    long countMyTaskJa(@Param("terms") Map<String, Object> terms);
 
     /**
-     * 首页-待审核分页查询
+     * 首页-结案申请/已结案分页查询
      * @param page 分页对象
      * @param terms 条件
      * @return List<FrontPageListDTO>
      */
-    List<FrontPageListDTO> listMySubmitApplyReview(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
+    List<FrontPageListJADTO> listMyTaskJa(@Param("page") PageRequest page, @Param("terms") Map<String, Object> terms);
 }

--
Gitblit v1.8.0