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/service/CaseWindupApplyService.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java
index 42a6a3d..8dd1018 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseWindupApplyService.java
@@ -5,6 +5,7 @@
import cn.huge.base.common.utils.IdUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.cases.domain.dto.FrontPageListDTO;
+import cn.huge.module.cases.domain.dto.FrontPageListJADTO;
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseWindupApplyMapper;
@@ -14,13 +15,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -190,23 +189,21 @@
}
/**
- * 首页-查询待办任务-办理任务数量统计
+ * 首页-查询待办任务-结案申请/已结案条件统计
* @param terms 条件
* @return Page
*/
- public long countMySubmitApplyReview(Map<String, Object> terms){
- long total = mapper.countMySubmitApplyReview(terms);
- return total;
+ public long countMyTaskJa(Map<String, Object> terms){
+ return mapper.countMyTaskJa(terms);
}
/**
- * 首页-查询待办任务-办理任务
+ * 首页-查询待办任务-结案申请/已结案分页查询
* @param page 分页对象
* @param terms 条件
* @return Page
*/
- public List<FrontPageListDTO> listMySubmitApplyReview(PageRequest page, Map<String, Object> terms){
- List<FrontPageListDTO> frontPageListDTOList = mapper.listMySubmitApplyReview(page, terms);
- return frontPageListDTOList;
+ public List<FrontPageListJADTO> listMyTaskJa(PageRequest page, Map<String, Object> terms){
+ return mapper.listMyTaskJa(page, terms);
}
}
--
Gitblit v1.8.0