Browse Source

简化党组织树返回字段

dev
YUJT 3 years ago
parent
commit
b3e99acf4a
  1. 32
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java
  2. 2
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
  3. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml

32
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java

@ -28,12 +28,6 @@ public class IcPartyOrgTreeDTO implements Serializable {
*/ */
private String pid; private String pid;
/**
* 党组织的上级ID,没有上级时为0
*/
private String orgPid;
/** /**
* 党组织的所有上级ID,没有上级时为0 * 党组织的所有上级ID,没有上级时为0
*/ */
@ -59,32 +53,6 @@ public class IcPartyOrgTreeDTO implements Serializable {
*/ */
private String partyOrgName; private String partyOrgName;
/**
* 组织编码
*/
private String partyOrgCode;
/**
* 经度
*/
private String longitude;
/**
* 纬度
*/
private String latitude;
/**
* 地址
*/
private String address;
/**
* 党组织介绍
*/
private String introduction;
private List<IcPartyOrgTreeDTO> children = new ArrayList<>(); private List<IcPartyOrgTreeDTO> children = new ArrayList<>();

2
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java

@ -163,7 +163,7 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
} }
for(IcPartyOrgTreeDTO node : nodeMap.values()) { for(IcPartyOrgTreeDTO node : nodeMap.values()) {
IcPartyOrgTreeDTO parent = nodeMap.get(node.getOrgPid()); IcPartyOrgTreeDTO parent = nodeMap.get(node.getPid());
if(parent != null && !(node.getId().equals(parent.getId()))){ if(parent != null && !(node.getId().equals(parent.getId()))){
parent.getChildren().add(node); parent.getChildren().add(node);
continue; continue;

11
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml

@ -27,21 +27,12 @@
<select id="getTreelist" resultType="com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO"> <select id="getTreelist" resultType="com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO">
select ID, select ID,
CUSTOMER_ID, CUSTOMER_ID,
ORG_PID,
ORG_PID as pid, ORG_PID as pid,
ORG_PIDS, ORG_PIDS,
AGENCY_ID, AGENCY_ID,
AGENCY_PIDS, AGENCY_PIDS,
PARTY_ORG_TYPE, PARTY_ORG_TYPE,
PARTY_ORG_NAME, PARTY_ORG_NAME
PARTY_ORG_CODE,
INTRODUCTION,
DEL_FLAG,
REVISION,
CREATED_BY,
CREATED_TIME,
UPDATED_BY,
UPDATED_TIME
from ic_party_org from ic_party_org
where DEL_FLAG=0 where DEL_FLAG=0
and CUSTOMER_ID=#{customerId} and CUSTOMER_ID=#{customerId}

Loading…
Cancel
Save