From 4ae2b4ad67cc869f09bbf93152cf9b7694dee44d Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 27 May 2022 10:59:23 +0800 Subject: [PATCH] =?UTF-8?q?branchList=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/result/BranchListResultDTO.java | 34 ------------------- .../controller/IcPartyOrgController.java | 5 ++- .../partyOrg/service/IcPartyOrgService.java | 3 +- .../service/impl/IcPartyOrgServiceImpl.java | 10 +++--- .../mapper/partyOrg/IcPartyOrgDao.xml | 18 ++++++---- 5 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/BranchListResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/BranchListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/BranchListResultDTO.java deleted file mode 100644 index bec618639d..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/BranchListResultDTO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.epmet.resi.partymember.dto.partyOrg.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @program: epmet-cloud - * @description: - * @author: wangtong - * @create: 2022-05-25 11:15 - **/ -@Data -public class BranchListResultDTO implements Serializable { - - /** - * 工作人员所属组织ID - */ - private String agencyId; - - /** - * 工作人员所属组织ID的pids - */ - private String agencyPIds; - - /** - * 工作人员所属组织名称 - */ - private String agencyName; - - private List children = new ArrayList<>(); -} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index eba6ae8d69..ecee24f672 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -15,7 +15,6 @@ import com.epmet.modules.partyOrg.excel.IcPartyOrgExcel; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -103,8 +102,8 @@ public class IcPartyOrgController { * @params [tokenDto] * @return com.epmet.commons.tools.utils.Result */ - @GetMapping("branchlist") - public Result branchlist(@LoginUser TokenDto tokenDto){ + @PostMapping("branchlist") + public Result branchlist(@LoginUser TokenDto tokenDto){ return icPartyOrgService.branchlist(tokenDto); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index db1a7a6162..c6bee9a2eb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -7,7 +7,6 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.List; @@ -97,5 +96,5 @@ public interface IcPartyOrgService extends BaseService { * @params [tokenDto] * @return com.epmet.commons.tools.utils.Result */ - Result branchlist(TokenDto tokenDto); + Result branchlist(TokenDto tokenDto); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index db2cdc5988..89ee7f4f89 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -22,7 +22,6 @@ import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -213,11 +212,14 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl branchlist(TokenDto tokenDto) { + public Result branchlist(TokenDto tokenDto) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); - BranchListResultDTO result = ConvertUtils.sourceToTarget(staffInfo, BranchListResultDTO.class); + IcPartyOrgTreeDTO result = new IcPartyOrgTreeDTO(); + result.setId(staffInfo.getAgencyId()); + result.setOrgPids(staffInfo.getAgencyPIds()); + result.setPartyOrgName(staffInfo.getAgencyName()); result.setChildren(baseDao.selectAllBranchByAgencyId(staffInfo.getAgencyId(),tokenDto.getCustomerId())); - return new Result().ok(result); + return new Result().ok(result); } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 78e4b2b7bf..1e365e0490 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -36,12 +36,18 @@ from ic_party_org where DEL_FLAG=0 and CUSTOMER_ID=#{customerId} - - AND (AGENCY_ID = #{agencyId} or AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' )) - - - or id =#{orgPid} - + + + AND ((AGENCY_ID = #{agencyId} or AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' )) + or + id =#{orgPid}) + + + + AND (AGENCY_ID = #{agencyId} or AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' )) + + +