From 5863caca2b6afd82e845ecc6e51b7430404d3d85 Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Sat, 7 Oct 2023 10:56:29 +0800 Subject: [PATCH] 2 --- .../AccountingAgentTaskController.java | 46 +++++++++++++ .../agentcenter/AgentTaskController.java | 1 - .../agentcenter/domain/TAgentContraction.java | 6 +- .../ruoyi/agentcenter/domain/TAgentTask.java | 3 + .../mapper/TAgentContractionMapper.java | 2 + .../service/impl/AgentCenterImpl.java | 10 +-- .../service/impl/TAgentTaskServiceImpl.java | 28 +++++++- .../agentcenter/TAgentContractionMapper.xml | 34 ++++++++++ .../mapper/agentcenter/TAgentTaskMapper.xml | 6 +- .../core/controller/BaseController.java | 8 +++ .../common/core/domain/entity/SysDept.java | 23 +++++++ .../ruoyi/common/core/page/TableSupport.java | 11 ++++ .../java/com/ruoyi/common/enums/Enums.java | 11 ++++ .../com/ruoyi/common/utils/DeptUtils.java | 65 +++++++++++++++++++ .../com/ruoyi/common/utils/PageUtils.java | 24 +++++++ .../ruoyi/system/service/ISysDeptService.java | 1 + .../service/impl/SysDeptServiceImpl.java | 6 ++ 17 files changed, 275 insertions(+), 10 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AccountingAgentTaskController.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/enums/Enums.java 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 new file mode 100644 index 0000000..c72b55f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AccountingAgentTaskController.java @@ -0,0 +1,46 @@ +package com.ruoyi.web.controller.agentcenter; + +import com.ruoyi.agentcenter.domain.TAgentTask; +import com.ruoyi.agentcenter.service.ITAgentTaskService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.utils.PageUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Arrays; +import java.util.List; + +/** + * 任务清单Controller + * + * @author zhao + * @date 2023-05-06 + */ +@RestController +@RequestMapping("/accounting/task") +public class AccountingAgentTaskController extends BaseController +{ + @Autowired + private ITAgentTaskService tAgentTaskService; + + /** + * 获取任务清单列表(按镇村分组) + */ + @PreAuthorize("@ss.hasPermi('agentcenter:task:list')") + @GetMapping(value = "/todoTaskList") + public TableDataInfo todoTaskList(TAgentTask task) + { + 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()); + }); + return getDataTable(tAgentTasks); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AgentTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AgentTaskController.java index 66342ed..11e9bde 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AgentTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/agentcenter/AgentTaskController.java @@ -44,7 +44,6 @@ public class AgentTaskController extends BaseController public TableDataInfo taskList(TAgentTask task) { startPage(); - task.setEndAt(DateUtils.getDate()); return getDataTable(tAgentTaskService.getTownTaskList(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 dea0130..c24637f 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 @@ -68,11 +68,11 @@ public class TAgentContraction extends BaseEntity private String orderMonth; /** 任务状态 字典 agent_status */ - @Excel(name = "任务状态 字典 agent_status") + @Excel(name = "任务状态", dictType = "agent_status") private String agentStatus; /** 记账状态 字典 order_status */ - @Excel(name = "记账状态 字典 order_status") + @Excel(name = "记账状态", dictType = "order_status") private String orderStatus; public void normalized() @@ -80,4 +80,6 @@ public class TAgentContraction extends BaseEntity orderYear = DateUtil.format(orderAt, "yyyy"); orderMonth = DateUtil.format(orderAt, "MM"); } + + private Long rootId; } 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 09fcd02..8b1900c 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 @@ -168,4 +168,7 @@ public class TAgentTask extends BaseEntity @Excel(name = "是否评价", dictType = "sys_yes_no") private String isAppraise; + /** 其他数 */ + @Excel(name = "其他数") + private Integer otherCount; } diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/mapper/TAgentContractionMapper.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/mapper/TAgentContractionMapper.java index e4ac7e6..2f52887 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/mapper/TAgentContractionMapper.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/mapper/TAgentContractionMapper.java @@ -99,4 +99,6 @@ public interface TAgentContractionMapper * @return 合同任务是否存在 */ public int selectTAgentContractionExists(TAgentContraction tAgentContraction); + + public List getAgentContractionGroupByDept(TAgentContraction tAgentContraction); } diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/AgentCenterImpl.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/AgentCenterImpl.java index 9b1def9..a55d13f 100644 --- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/AgentCenterImpl.java +++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/service/impl/AgentCenterImpl.java @@ -36,10 +36,10 @@ public class AgentCenterImpl implements IAgentCenter return protocol; } - public Session createSession(NSSDKServer server, HttpServletRequest request) + public Session createSession(NSSDKServer server, HttpServletRequest request) { NSReportObject reportObject; - Session session; + Session session; Class clazz; int protocol; @@ -64,7 +64,7 @@ public class AgentCenterImpl implements IAgentCenter return session; } - private void check(Session session, HttpServletRequest request) + private void check(Session session, HttpServletRequest request) { Assert.notNull(session, "无效消息"); String identifier = session.identifier; @@ -73,6 +73,8 @@ public class AgentCenterImpl implements IAgentCenter Assert.notNull(dept, "不支持的地区: {}", identifier); String remoteUrl = dept.getRemoteUrl(); Assert.notBlank(remoteUrl, "该地区无项目: {}", identifier); + + session.data.setDeptId(dept.getDeptId()); /*try { URL url = new URL(remoteUrl); @@ -94,7 +96,7 @@ public class AgentCenterImpl implements IAgentCenter @Override public Session postHandle(NSSDKServer server, HttpServletRequest request) { - Session session; + Session session; session = createSession(server, request); check(session, request); 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 77e24a0..c4528b9 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 @@ -4,15 +4,20 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.function.Consumer; +import java.util.stream.Collectors; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; +import com.ruoyi.agentcenter.domain.TAgentContraction; +import com.ruoyi.agentcenter.mapper.TAgentContractionMapper; import com.ruoyi.agentcenter.vo.AgentTaskTownGroup; import com.ruoyi.agentcenter.vo.AgentTaskVillageGroup; import com.ruoyi.common.core.domain.entity.SysDept; +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.StringUtils; import com.ruoyi.system.mapper.SysDeptMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,7 +39,9 @@ public class TAgentTaskServiceImpl implements ITAgentTaskService @Autowired private TAgentTaskMapper tAgentTaskMapper; @Autowired - private SysDeptMapper sysDeptMapper; + private SysDeptMapper sysDeptMapper; + @Autowired + private TAgentContractionMapper agentContractionMapper; /** * 查询任务清单 @@ -286,9 +293,26 @@ 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); @@ -298,7 +322,9 @@ 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<>())); diff --git a/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentContractionMapper.xml b/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentContractionMapper.xml index fa9a221..0ced645 100644 --- a/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentContractionMapper.xml +++ b/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentContractionMapper.xml @@ -247,6 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and order_month = #{orderMonth} and agent_status = #{agentStatus} and order_status = #{orderStatus} + and (dept_id = #{rootId} OR dept_id IN (SELECT dept_id FROM sys_dept WHERE FIND_IN_SET(#{rootId}, ancestors))) @@ -271,4 +272,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" limit 1 ) + + \ No newline at end of file diff --git a/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml b/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml index 3997d13..8022fa5 100644 --- a/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml +++ b/ruoyi-agentcenter/src/main/resources/mapper/agentcenter/TAgentTaskMapper.xml @@ -91,6 +91,9 @@ AND org_code IN (null ,#{i} ) + + AND agent_status IN (null ,#{i} ) + @@ -538,7 +541,6 @@ COUNT(*) as num, IFNULL(SUM(IF(agent_status = '3', 1, 0)), 0) as num_process_finish, IFNULL(SUM(IF(is_audit = 'Y', 1, 0)), 0) as num_approval_finish, - IFNULL(SUM(IF(agent_status != '3' AND end_at < #{endAt}, 1, 0)), 0) as num_except, town_name, town_code, order_year, order_month FROM @@ -546,6 +548,7 @@ and agent_center = #{agentCenter} and county_code = #{countyCode} + and town_code = #{townCode} and order_year = #{orderYear} and order_month = #{orderMonth} @@ -574,7 +577,6 @@ COUNT(*) as num, IFNULL(SUM(IF(agent_status = '3', 1, 0)), 0) as num_process_finish, IFNULL(SUM(IF(is_audit = 'Y', 1, 0)), 0) as num_approval_finish, - IFNULL(SUM(IF(agent_status != '3' AND end_at < #{endAt}, 1, 0)), 0) as num_except, org_name, org_code, town_code, MAX(end_at) as end_at, MAX(handle_date) as handle_date, MAX(end_at) as end_at, handle_nick FROM diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 92a4b8c..05c1cd2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -53,6 +53,14 @@ public class BaseController * 设置请求分页数据 */ protected void startPage() + { + PageUtils.startPageIf(); + } + + /** + * 设置请求分页数据 + */ + protected void mustPage() { PageUtils.startPage(); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index c02826c..8fc9d86 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -301,4 +301,27 @@ public class SysDept extends BaseEntity { this.orgCodeLength = orgCodeLength; } + + private List childrenIdList; + private List ancestorsIdList; + + public List getChildrenIdList() + { + return childrenIdList; + } + + public void setChildrenIdList(List childrenIdList) + { + this.childrenIdList = childrenIdList; + } + + public List getAncestorsIdList() + { + return ancestorsIdList; + } + + public void setAncestorsIdList(List ancestorsIdList) + { + this.ancestorsIdList = ancestorsIdList; + } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java index a120c30..5f74811 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java @@ -49,6 +49,17 @@ public class TableSupport return pageDomain; } + public static PageDomain getPageDomain(Integer pageNum, Integer pageSize) + { + PageDomain pageDomain = new PageDomain(); + pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), pageNum)); + pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), pageSize)); + pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); + pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); + pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE)); + return pageDomain; + } + public static PageDomain buildPageRequest() { return getPageDomain(); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/Enums.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/Enums.java new file mode 100644 index 0000000..476f958 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/Enums.java @@ -0,0 +1,11 @@ +package com.ruoyi.common.enums; + +public final class Enums +{ + public final static class OrderStatus + { + public static final String READY = "2"; // 待记账 + public static final String FINISHED = "3"; // 已记账 + public static final String PAUSE = "4"; // 已挂起 + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DeptUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DeptUtils.java index 3f8fb34..1cbaed3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DeptUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DeptUtils.java @@ -1,5 +1,17 @@ package com.ruoyi.common.utils; +import cn.hutool.core.collection.CollectionUtil; +import com.ruoyi.common.core.domain.entity.SysDept; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collector; +import java.util.stream.Collectors; + public final class DeptUtils { public static final int LEVEL_INVALID = 0; // 无效 @@ -144,5 +156,58 @@ public final class DeptUtils return null == level ? LEVEL_INVALID : Integer.parseInt(level); } + public static List getSubDepts_selfAndAllChildren(Long deptId, List depts) + { + if(CollectionUtil.isEmpty(depts)) + return new ArrayList<>(); + if(depts.size() == 1) + { + SysDept dept = depts.get(0); + if(deptId.equals(dept.getDeptId())) + { + dept.setChildren(new ArrayList<>(depts)); + dept.setChildrenIdList(new ArrayList<>(Collections.singletonList(dept.getDeptId()))); + return depts; + } + else + return new ArrayList<>(); + } + + //depts.removeIf((x) -> deptId.equals(x.getDeptId())); + depts.forEach((x) -> x.setAncestorsIdList(x.makeAncestorsIdList(true))); + List res = depts.stream() + .filter((x) -> deptId.equals(x.getParentId())) + .peek((x) -> x.setChildren(new ArrayList<>(Collections.singletonList(x)))) + .peek((x) -> x.setChildrenIdList(new ArrayList<>(Collections.singletonList(x.getDeptId())))) + .peek((x) -> x.getChildren().addAll(depts.stream().filter((y) -> CollectionUtil.contains(y.getAncestorsIdList(), x.getDeptId())).collect(Collectors.toList()))) + .peek((x) -> x.getChildrenIdList().addAll(depts.stream().filter((y) -> CollectionUtil.contains(y.getAncestorsIdList(), x.getDeptId())).map(SysDept::getDeptId).collect(Collectors.toList()))) + .collect(Collectors.toList()); + return res; + } + + public static Map> groupByDept(Long deptId, List allDepts, List list, Function getDeptId, List returnDeptList) + { + return groupByDept(deptId, allDepts, list, getDeptId, Collectors.toList(), returnDeptList); + } + + public static Map groupByDept(Long deptId, List allDepts, List list, Function getDeptId, Collector collector, List returnDeptList) + { + List depts = getSubDepts_selfAndAllChildren(deptId, allDepts); + Map deptMap = new HashMap<>(); + depts.forEach((x) -> { + deptMap.put(x.getDeptId(), x.getDeptId()); + x.getChildrenIdList().forEach((y) -> { + deptMap.put(y, x.getDeptId()); + }); + }); + Map collect = list.stream() + .collect(Collectors.groupingBy((x) -> deptMap.getOrDefault(getDeptId.apply(x), 0L), collector)); + if(null != returnDeptList) + { + returnDeptList.addAll(depts); + } + return collect; + } + private DeptUtils() {} } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java index 70e9b08..c416901 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java @@ -25,6 +25,30 @@ public class PageUtils extends PageHelper PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); } + /** + * 设置请求分页数据 + */ + public static void startPageIf() + { + PageDomain pageDomain = TableSupport.getPageDomain(null, null); + Integer pageNum = pageDomain.getPageNum(); + Integer pageSize = pageDomain.getPageSize(); + if(null != pageNum && null != pageSize) + { + PageHelper.startPage(pageNum, pageSize); + } + String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); + if(StringUtils.isNotEmpty(orderBy)) + { + PageHelper.orderBy(orderBy); + } + if(null != PageHelper.getLocalPage()) + { + Boolean reasonable = pageDomain.getReasonable(); + PageHelper.getLocalPage().setReasonable(reasonable); + } + } + /** * 清理分页的线程变量 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index 2009604..e0e0308 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -139,4 +139,5 @@ public interface ISysDeptService public List getDeptTree(SysDept dept); public List getCityTree(SysDept dept); + public SysDept selectSysDeptByOrgCode(String orgCode); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index bd041d3..14c9373 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -382,4 +382,10 @@ public class SysDeptServiceImpl implements ISysDeptService depts.removeIf((x) -> x.orgCodeLength() != 6); return depts; } + + @Override + public SysDept selectSysDeptByOrgCode(String orgCode) + { + return deptMapper.selectSysDeptByOrgCode(orgCode); + } }