From df5414b84bf33c55a3aab890baaa0bd8eabcd70c Mon Sep 17 00:00:00 2001 From: liyj <15602261488@163.com> Date: Sun, 22 Sep 2024 13:01:50 +0800 Subject: [PATCH] 1、工作台-全部已办、事项草稿数量统计 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java index 296fe16..5eaa724 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java @@ -22,6 +22,8 @@ import cn.huge.module.cust.constant.UserBaseConsts; import cn.huge.module.cust.dto.CtUnitDTO; import cn.huge.module.cust.dto.CtUserDTO; +import cn.huge.module.draft.domain.po.CasedraftInfo; +import cn.huge.module.draft.service.CasedraftInfoService; import cn.huge.module.mediate.constant.AuditBaseConsts; import cn.huge.module.mediate.constant.AuditBaseConstsEnum; import cn.huge.module.disp.constant.DispBaseConstsEnum; @@ -99,6 +101,8 @@ private CaseAssistInfoService caseAssistInfoService; @Autowired private CaseDismissService caseDismissService; + @Autowired + private CasedraftInfoService casedraftInfoService; /** * 更新对象 @@ -244,6 +248,9 @@ TabButtonInfoDTO daxx = new TabButtonInfoDTO(); daxx.setId("daxx"); daxx.setName("档案信息"); + TabButtonInfoDTO byslxq = new TabButtonInfoDTO(); + byslxq.setId("byslxq"); + byslxq.setName("详情"); // 定义button TabButtonInfoDTO tjbljl = new TabButtonInfoDTO(); @@ -282,8 +289,8 @@ List<TabButtonInfoDTO> buttonList = new LinkedList<>(); if (ObjectUtils.isNotEmpty(caseTask)) { // 不予受理 - if (CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){ - tabList.add(daxx); + if (ObjectUtils.isNotEmpty(caseTask.getHandleResult()) && CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){ + tabList.add(byslxq); tabList.add(sqjl); }else { @@ -756,6 +763,16 @@ long countAppearReview = caseAppearService.countAppearReview(loginUser.getUnitId()); long countAssistReview = caseAssistApplyService.countAssistReview(loginUser.getUnitId()); frontPageCountDTO.setWaitReview(countApplyReview+countReturnReview+countAppearReview+countAssistReview); + // 已办 + Map<String, Object> ybTerms = new HashMap<>(); + ybTerms.put("handleUnitId", loginUser.getUnitId()); + long alreadyDone = mapper.countMyTaskYb(ybTerms); + frontPageCountDTO.setAlreadyDone(alreadyDone); + // 已办 + Map<String, Object> cgTerms = new HashMap<>(); + cgTerms.put("inputUnitId", loginUser.getUnitId()); + long caseDraft = casedraftInfoService.countTerms(cgTerms); + frontPageCountDTO.setCaseDraft(caseDraft); return frontPageCountDTO; }catch (Exception e) { log.error("[CaseTaskService.getCountList]调用失败,异常信息:" + e, e); @@ -773,10 +790,6 @@ try { long total = mapper.countMyTaskFp(terms); List<FrontPageListFPDTO> frontPageListFPDTOList = mapper.pageMyTaskFp(page, terms); - for (FrontPageListFPDTO frontPageListFPDTO: frontPageListFPDTOList){ - // 查询督办次数 - - } return new PageImpl<FrontPageListFPDTO>(frontPageListFPDTOList, page, total); }catch (Exception e) { log.error("[CaseTaskService.pageMyTaskFp]调用失败,异常信息:" + e, e); @@ -2609,4 +2622,22 @@ public List<SignTaskDTO> listIdByTerms(Map<String, Object> terms){ return mapper.listIdByTerms(terms); } + + /** + * web端-工作台-已办事项 + * @param page 分页对象 + * @param terms 条件 + * @return Page + */ + public Page<FrontPageListYBDTO> pageMyTaskYb(PageRequest page, Map<String, Object> terms){ + try { + long total = mapper.countMyTaskYb(terms); + List<FrontPageListYBDTO> frontPageListYBDTOList = mapper.pageMyTaskYb(page, terms); + return new PageImpl<FrontPageListYBDTO>(frontPageListYBDTOList, page, total); + }catch (Exception e) { + log.error("[CaseTaskService.pageMyTaskYb]调用失败,异常信息:" + e, e); + throw new ServiceException("CaseTaskService.pageMyTaskYb", e); + } + } + } -- Gitblit v1.8.0