From aba271c296ca7698e44f287c613610f79b5e8723 Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Sat, 7 Oct 2023 17:20:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/agentcenter/domain/TAgentTask.java | 7 +++- .../agentcenter/mapper/TAgentTaskMapper.java | 1 + .../service/impl/TAgentTaskServiceImpl.java | 23 +---------- .../mapper/agentcenter/TAgentTaskMapper.xml | 39 +++++++++++++++++-- 4 files changed, 44 insertions(+), 26 deletions(-) diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentTask.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentTask.java index d06cad6..66db4fb 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentTask.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentTask.java @@ -170,6 +170,11 @@ public class TAgentTask extends BaseEntity private String isAppraise; /** 其他数 */ - @Excel(name = "其他数") private Integer otherCount; + + /** 异常数 */ + @Excel(name = "异常数") + private Integer abnormalCount; + + private Boolean overdue; } diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/mapper/TAgentTaskMapper.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/mapper/TAgentTaskMapper.java index 29b8fb2..a3b66d5 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/mapper/TAgentTaskMapper.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/mapper/TAgentTaskMapper.java @@ -108,4 +108,5 @@ public interface TAgentTaskMapper public List getAgentTaskGroupByVillage(TAgentTask tAgentTask); public List getProcessedAgentTaskGroupByVillage(TAgentTask tAgentTask); public Long getAgentTaskOverdueFinishVillageCount(TAgentTask tAgentTask); + public List getTAgentTaskProcessedList(TAgentTask tAgentTask); } diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java index 5059f25..8539103 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/TAgentTaskServiceImpl.java @@ -42,8 +42,6 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService private TAgentTaskMapper tAgentTaskMapper; @Autowired private SysDeptMapper sysDeptMapper; - @Autowired - private TAgentContractionMapper agentContractionMapper; /** * 查询任务清单 @@ -295,26 +293,9 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService List agentTaskGroupByTown = tAgentTaskMapper.getAgentTaskGroupByTown(tAgentTask); if(CollectionUtil.isNotEmpty(agentTaskGroupByTown)) { - List deptList = sysDeptMapper.getDeptList(new SysDept()); - Long rootId; - if(StringUtils.isNotEmpty(tAgentTask.getTownCode())) - rootId = deptList.stream().filter((x) -> tAgentTask.getTownCode().equals(x.getOrgCode())).map(SysDept::getParentId).findFirst().get(); - else - rootId = deptList.stream().filter((x) -> tAgentTask.getCountyCode().equals(x.getOrgCode())).map(SysDept::getDeptId).findFirst().get(); - - TAgentContraction contractionCond = new TAgentContraction(); - contractionCond.setOrderStatus(Enums.OrderStatus.PAUSE); - contractionCond.putParam("task", tAgentTask); - List contractionList = agentContractionMapper.getAgentContractionGroupByDept(contractionCond); - Map townExceptMap = DeptUtils.groupByDept(rootId, deptList, contractionList, TAgentContraction::getDeptId, Collectors.mapping(TAgentContraction::getId, Collectors.reducing(0L, Long::sum)), null); - List townCodeList = ContainerUtils.mapToList(agentTaskGroupByTown, AgentTaskTownGroup::getTownCode); - Map contractionMap = ContainerUtils.toMap(contractionList, TAgentContraction::getOrgCode, TAgentContraction::getId); List villageGroups = tAgentTaskMapper.getAgentTaskGroupByVillage(new TAgentTask().putParam("townCodeList", townCodeList)); - villageGroups.forEach((x) -> { - x.setNumExcept(contractionMap.getOrDefault(x.getOrgCode(), 0L)); - }); Map> villageMap = ContainerUtils.groupingBy(villageGroups, AgentTaskVillageGroup::getTownCode); List orgCodeList = ContainerUtils.mapToList(villageGroups, AgentTaskVillageGroup::getOrgCode); @@ -324,9 +305,7 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService List tAgentTasks = tAgentTaskMapper.selectTAgentTaskList(agentTaskCond); Map> bookGroup = ContainerUtils.groupingBy(tAgentTasks, TAgentTask::getOrgCode); - Map deptIdMap = ContainerUtils.toMap(deptList, SysDept::getOrgCode, SysDept::getDeptId); agentTaskGroupByTown.forEach((town) -> { - town.setNumExcept(townExceptMap.getOrDefault(deptIdMap.get(town.getTownCode()), 0L)); town.setVillageList(villageMap.getOrDefault(town.getTownCode(), new ArrayList<>())); town.getVillageList().forEach((village) -> { village.setTaskList(bookGroup.getOrDefault(village.getOrgCode(), new ArrayList<>())); @@ -355,7 +334,7 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService if(CollectionUtil.isNotEmpty(list)) { PageUtils.orderBy("org_code"); - List tAgentTasks = tAgentTaskMapper.selectTAgentTaskList(tAgentTask); + List tAgentTasks = tAgentTaskMapper.getTAgentTaskProcessedList(tAgentTask); tAgentTasks.forEach((x) -> { x.setOtherCount(x.getAllCount() - x.getContracCount() - x.getVoucherCount()); }); diff --git a/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml b/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml index 3653fc6..3297365 100644 --- a/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml +++ b/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml @@ -44,10 +44,13 @@ + + + - select id, agent_center, county_code, county_name, town_code, town_name, org_code, org_name, book_id, book_name, order_year, order_month, voucher_count, contrac_count, asset_count, all_count, finish_count, agent_status, distri_user, distri_nick, distri_date, end_at, handle_user, handle_nick, handle_remark, handle_date, audit_user, audit_nick, audit_date, is_audit, appraise_user, appraise_nick, appraise_score, appraise_remark, is_appraise, create_by, create_time, update_by, update_time from t_agent_task + select id, agent_center, county_code, county_name, town_code, town_name, org_code, org_name, book_id, book_name, order_year, order_month, voucher_count, contrac_count, asset_count, all_count, finish_count, agent_status, distri_user, distri_nick, distri_date, end_at, handle_user, handle_nick, handle_remark, handle_date, audit_user, audit_nick, audit_date, is_audit, appraise_user, appraise_nick, appraise_score, appraise_remark, is_appraise, create_by, create_time, update_by, update_time, abnormal_count from t_agent_task + + \ No newline at end of file