Merge branch 'dev_ic_data' into develop

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

@@ -26,6 +26,10 @@ public class AgencyTreeResultDTO implements Serializable {
     private String pid;
 
     private String level;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
     /**
      * 下级机关组织
      */

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

@@ -28,4 +28,8 @@ public class ExtGridResultDTO implements Serializable {
      * 当前gridId所属的客户id add02.03
      * */
     private String customerId;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
 }

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

@@ -50,4 +50,8 @@ public class ExtStaffPermissionResultDTO implements Serializable {
      * 当前agencyId所属的客户id add02.03
      * */
     private String customerId;
+    //经度【没值则取跟客户的值】
+    private String longitude;
+    //维度【没值则取跟客户的值】
+    private String latitude;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -1119,6 +1119,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         result.setAgencyName(rootAgency.getAgencyName());
         result.setAgencyId(rootAgency.getAgencyId());
         result.setLevel(rootAgency.getLevel());
+        result.setLongitude(rootAgency.getLongitude());
+        result.setLatitude(rootAgency.getLatitude());
         ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(rootAgency.getAgencyId());
         convert2AgencyTreeResult(result,res.getSubAgencyList(),res.getGridList());
         return result;
@@ -1137,6 +1139,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 resultDTO.setAgencyName(agency.getAgencyName());
                 resultDTO.setPid(root.getAgencyId());
                 resultDTO.setLevel(agency.getLevel());
+                resultDTO.setLongitude(agency.getLongitude());
+                resultDTO.setLatitude(agency.getLatitude());
 
                 if (root.getSubAgencyList() == null) {
                     root.setSubAgencyList(new ArrayList<>());
@@ -1153,6 +1157,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 grid.setPid(root.getAgencyId());
                 grid.setLevel("grid");
                 grid.setSubAgencyList(null);
+                grid.setLongitude(o.getLongitude());
+                grid.setLatitude(o.getLatitude());
                 if (root.getSubAgencyList() == null) {
                     root.setSubAgencyList(new ArrayList<>());
                 }

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

@@ -275,11 +275,15 @@
         <id column="agencyId" property="agencyId" />
         <result column="agencyName" property="agencyName"/>
         <result column="level" property="level" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
         <result column="customerId" property="customerId"/>
         <collection property="gridList" column="agencyId" ofType="com.epmet.dto.result.ExtGridResultDTO" select="selectGridList">
             <id column="gridId" property="gridId" />
             <result column="gridName" property="gridName" />
             <result column="customerId" property="customerId"/>
+            <result column="longitude" property="longitude" />
+            <result column="latitude" property="latitude" />
         </collection>
 
         <collection property="departmentList" column="agencyId" ofType="com.epmet.dto.result.ExtDeptResultDTO" select="selectDeptList">
@@ -310,7 +314,23 @@
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
-            agency.CUSTOMER_ID as customerId
+            agency.CUSTOMER_ID as customerId,
+            ( CASE WHEN agency.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.longitude
+                END
+            ) longitude,
+            ( CASE WHEN agency.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.latitude
+                END
+            ) latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE
@@ -334,9 +354,26 @@
         SELECT
             cg.id AS gridId,
             cg.GRID_NAME AS gridName,
-            cg.CUSTOMER_ID AS customerId
+            cg.CUSTOMER_ID AS customerId,
+            ( CASE WHEN ca.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.longitude
+                END
+            ) longitude,
+            ( CASE WHEN ca.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = ca.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE ca.latitude
+                END
+            ) latitude
         FROM
             customer_grid cg
+        INNER JOIN customer_agency ca ON cg.PID = ca.ID
         WHERE
             cg.DEL_FLAG = '0'
             AND cg.PID =#{agencyId}
@@ -347,7 +384,23 @@
             agency.ID AS agencyId,
             agency.ORGANIZATION_NAME AS agencyName,
             agency.LEVEL AS level,
-            agency.CUSTOMER_ID as customerId
+            agency.CUSTOMER_ID as customerId,
+            ( CASE WHEN agency.longitude is null THEN
+                ( SELECT longitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.longitude
+                END
+            ) longitude,
+            ( CASE WHEN agency.latitude is null THEN
+                ( SELECT latitude FROM customer_agency
+                    WHERE del_flag = '0' AND customer_id = (SELECT customer_id FROM customer_agency WHERE id = agency.id)
+                    ORDER BY pid ASC LIMIT 1
+                )
+                ELSE agency.latitude
+                END
+            ) latitude
         FROM
             CUSTOMER_AGENCY agency
         WHERE