Browse Source

/gov/org/customeragency/staffinagencylist返回orgIdPath

dev
yinzuomei 3 years ago
parent
commit
164ef32d2a
  1. 5
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
  2. 4
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java
  3. 12
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

5
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java

@ -47,5 +47,8 @@ public class AgencyResultDTO implements Serializable {
private String longitude;
//维度【没值则取跟客户的值】
private String latitude;
/**
* agencyId的全路径包含自身
*/
private String orgIdPath;
}

4
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencySubResultDTO.java

@ -61,4 +61,8 @@ public class AgencySubResultDTO implements Serializable {
* 组织维度没值取根组织的值
*/
private String latitude = "";
/**
* agencyId的全路径包含自身
*/
private String orgIdPath;
}

12
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@ -198,7 +198,11 @@
ca.pids AS "pids",
ca.level level,
IFNULL(ca.longitude, cc.longitude) longitude,
IFNULL(ca.latitude, cc.latitude) latitude
IFNULL(ca.latitude, cc.latitude) latitude,
(
case when ca.pid is null or ca.pid='0' or ca.pid='' then ca.id
else concat(ca.pids,':',ca.id)
end)as orgIdPath
FROM customer_agency ca
INNER JOIN customer_agency cc ON cc.pid = '0' AND ca.customer_id = cc.customer_id
WHERE ca.del_flag = '0'
@ -397,7 +401,11 @@
ca.pid pid,
ca.level level,
ca.longitude,
ca.latitude
ca.latitude,
(
case when ca.pid is null or ca.pid='0' or ca.pid='' then ca.id
else concat(ca.pids,':',ca.id)
end)as orgIdPath
FROM
customer_agency ca
INNER JOIN customer_staff_agency csa ON ca.id = csa.agency_id

Loading…
Cancel
Save