From bb671bc083d47aefde59d42358fca5149c4de2c9 Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Sat, 7 Oct 2023 15:27:54 +0800 Subject: [PATCH] 3 --- .../AccountingAgentTaskController.java | 24 ++++++--- .../agentcenter/domain/TAgentContraction.java | 4 +- .../ruoyi/agentcenter/domain/TAgentTask.java | 1 + .../agentcenter/mapper/TAgentTaskMapper.java | 2 + .../service/ITAgentTaskService.java | 5 ++ .../service/impl/TAgentTaskServiceImpl.java | 40 +++++++++++++++ .../agentcenter/vo/AgentTaskVillageGroup.java | 6 ++- .../mapper/agentcenter/TAgentTaskMapper.xml | 50 ++++++++++++++++++- .../ruoyi/common/core/page/TableDataInfo.java | 12 +++++ 9 files changed, 132 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AccountingAgentTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AccountingAgentTaskController.java index c72b55f..33b6f57 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AccountingAgentTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AccountingAgentTaskController.java @@ -2,7 +2,9 @@ package com.ruoyi.web.controller.agentcenter; import com.ruoyi.agentcenter.domain.TAgentTask; import com.ruoyi.agentcenter.service.ITAgentTaskService; +import com.ruoyi.agentcenter.vo.AgentTaskVillageGroup; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.utils.PageUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +17,7 @@ import java.util.Arrays; import java.util.List; /** - * 任务清单Controller + * 会计任务清单Controller * * @author zhao * @date 2023-05-06 @@ -28,7 +30,7 @@ public class AccountingAgentTaskController extends BaseController private ITAgentTaskService tAgentTaskService; /** - * 获取任务清单列表(按镇村分组) + * 待分配任务列表 */ @PreAuthorize("@ss.hasPermi('agentcenter:task:list')") @GetMapping(value = "/todoTaskList") @@ -36,11 +38,19 @@ public class AccountingAgentTaskController extends BaseController { startPage(); PageUtils.orderBy("org_code"); - task.putParam("agentStatusList", Arrays.asList(TAgentTask.AGENT_STATUS_READY, TAgentTask.AGENT_STATUS_PROCESSING)); - List tAgentTasks = tAgentTaskService.selectTAgentTaskList(task); - tAgentTasks.forEach((x) -> { - x.setOtherCount(x.getAllCount() - x.getContracCount() - x.getVoucherCount()); - }); + List tAgentTasks = tAgentTaskService.getTodoTaskList(task); return getDataTable(tAgentTasks); } + + /** + * 已完成任务列表 + */ + @PreAuthorize("@ss.hasPermi('agentcenter:task:list')") + @GetMapping(value = "/processedTaskList") + public AjaxResult processedTaskList(TAgentTask task) + { + startPage(); + List tAgentTasks = tAgentTaskService.getProcessedTaskList(task); + return getDataTable(tAgentTasks).toAjaxResult().put("overdue", tAgentTaskService.getAgentTaskOverdueFinishVillageCount(task)); + } } diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentContraction.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentContraction.java index c24637f..312ce25 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentContraction.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/domain/TAgentContraction.java @@ -60,11 +60,11 @@ public class TAgentContraction extends BaseEntity private Date orderAt; /** 上报年度(截) */ - @Excel(name = "上报年度(截)") + @Excel(name = "上报年度") private String orderYear; /** 上报月份(截) */ - @Excel(name = "上报月份(截)") + @Excel(name = "上报月份") private String orderMonth; /** 任务状态 字典 agent_status */ 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 8b1900c..d06cad6 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 @@ -23,6 +23,7 @@ public class TAgentTask extends BaseEntity public static final String AGENT_STATUS_READY = "1"; public static final String AGENT_STATUS_PROCESSING = "2"; public static final String AGENT_STATUS_FINISHED = "3"; + public static final String AGENT_STATUS_AUDITED = "4"; private static final long serialVersionUID = 1L; 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 d040f89..29b8fb2 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 @@ -106,4 +106,6 @@ public interface TAgentTaskMapper public List getAgentTaskGroupByTown(TAgentTask tAgentTask); public List getAgentTaskGroupByVillage(TAgentTask tAgentTask); + public List getProcessedAgentTaskGroupByVillage(TAgentTask tAgentTask); + public Long getAgentTaskOverdueFinishVillageCount(TAgentTask tAgentTask); } diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/ITAgentTaskService.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/ITAgentTaskService.java index 5ec9ffb..f8b08e9 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/ITAgentTaskService.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/ITAgentTaskService.java @@ -5,6 +5,7 @@ import java.util.function.Consumer; import com.ruoyi.agentcenter.domain.TAgentTask; import com.ruoyi.agentcenter.vo.AgentTaskTownGroup; +import com.ruoyi.agentcenter.vo.AgentTaskVillageGroup; /** * 任务清单Service接口 @@ -114,4 +115,8 @@ public interface ITAgentTaskService public int syncTAgentTaskCount(TAgentTask tAgentTask); public List getTownTaskList(TAgentTask tAgentTask); + + public List getTodoTaskList(TAgentTask tAgentTask); + public List getProcessedTaskList(TAgentTask tAgentTask); + public Long getAgentTaskOverdueFinishVillageCount(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 c4528b9..5059f25 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 @@ -1,6 +1,7 @@ package com.ruoyi.agentcenter.service.impl; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.function.Consumer; @@ -17,6 +18,7 @@ import com.ruoyi.common.enums.Enums; import com.ruoyi.common.utils.ContainerUtils; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DeptUtils; +import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.SysDeptMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -333,4 +335,42 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService } return agentTaskGroupByTown; } + + @Override + public List getTodoTaskList(TAgentTask tAgentTask) + { + tAgentTask.putParam("agentStatusList", Arrays.asList(TAgentTask.AGENT_STATUS_READY, TAgentTask.AGENT_STATUS_PROCESSING)); + List tAgentTasks = tAgentTaskMapper.selectTAgentTaskList(tAgentTask); + tAgentTasks.forEach((x) -> { + x.setOtherCount(x.getAllCount() - x.getContracCount() - x.getVoucherCount()); + }); + return tAgentTasks; + } + + @Override + public List getProcessedTaskList(TAgentTask tAgentTask) + { + tAgentTask.putParam("agentStatusList", Arrays.asList(TAgentTask.AGENT_STATUS_FINISHED, TAgentTask.AGENT_STATUS_AUDITED)); + List list = tAgentTaskMapper.getProcessedAgentTaskGroupByVillage(tAgentTask); + if(CollectionUtil.isNotEmpty(list)) + { + PageUtils.orderBy("org_code"); + List tAgentTasks = tAgentTaskMapper.selectTAgentTaskList(tAgentTask); + tAgentTasks.forEach((x) -> { + x.setOtherCount(x.getAllCount() - x.getContracCount() - x.getVoucherCount()); + }); + Map> taskGroup = ContainerUtils.groupingBy(tAgentTasks, TAgentTask::getOrgCode); + list.forEach((x) -> { + x.setTaskList(taskGroup.getOrDefault(x.getOrgCode(), new ArrayList<>())); + }); + } + return list; + } + + @Override + public Long getAgentTaskOverdueFinishVillageCount(TAgentTask tAgentTask) + { + tAgentTask.putParam("agentStatusList", Arrays.asList(TAgentTask.AGENT_STATUS_FINISHED, TAgentTask.AGENT_STATUS_AUDITED)); + return tAgentTaskMapper.getAgentTaskOverdueFinishVillageCount(tAgentTask); + } } diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/vo/AgentTaskVillageGroup.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/vo/AgentTaskVillageGroup.java index 036af46..b0fe579 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/vo/AgentTaskVillageGroup.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/vo/AgentTaskVillageGroup.java @@ -1,5 +1,6 @@ package com.ruoyi.agentcenter.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.agentcenter.domain.TAgentTask; import lombok.Data; import lombok.experimental.Accessors; @@ -16,13 +17,14 @@ public class AgentTaskVillageGroup private Long numApprovalFinish; private Long numExcept; private String townCode; + private Long numNotApproval; private String orgName; private String orgCode; private Long bookId; private String bookName; - private Date distriDate; - private Date handleDate; + private String distriDate; + private String handleDate; private String endAt; private String handleNick; diff --git a/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml b/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml index 8022fa5..3653fc6 100644 --- a/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml +++ b/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml @@ -570,6 +570,7 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java index 847685b..c20264c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java @@ -1,5 +1,7 @@ package com.ruoyi.common.core.page; +import com.ruoyi.common.core.domain.AjaxResult; + import java.io.Serializable; import java.util.List; @@ -82,4 +84,14 @@ public class TableDataInfo implements Serializable { this.msg = msg; } + + public AjaxResult toAjaxResult() + { + AjaxResult result = new AjaxResult(); + result.put(AjaxResult.CODE_TAG, code); + result.put(AjaxResult.MSG_TAG, msg); + result.put("rows", rows); + result.put("total", total); + return result; + } }