From 278d046e8060a37439ee9f442503eaeb0e8a379e Mon Sep 17 00:00:00 2001 From: xusd <hugeinfo123> Date: Sat, 21 Sep 2024 18:37:56 +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 | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 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..11a3c95 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; @@ -190,23 +191,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