Merge branch 'dev_ic_data' into develop

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

@@ -49,4 +49,16 @@ public class AgencySubResultDTO implements Serializable {
      * 当前组织的所有上级组织Id
      */
     private String pids = "";
+    /**
+     * 组织级别
+     */
+    private String level = "";
+    /**
+     * 组织经度【没值取根组织的值】
+     */
+    private String longitude = "";
+    /**
+     * 组织维度【没值取根组织的值】
+     */
+    private String latitude = "";
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@@ -314,7 +314,7 @@ public class CustomerGridController {
      * @Author sun
      * @Description 查询组织直属网格列表
      **/
-    @PostMapping("getGridIListByAgency/{agencyId}")
+    @PostMapping("getgridilistbyagency/{agencyId}")
     public Result<List<AgencyGridList>> gridListByAgencyId(@PathVariable("agencyId") String agencyId) {
         return new Result<List<AgencyGridList>>().ok(customerGridService.gridListByAgencyId(agencyId));
     }

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

@@ -178,13 +178,30 @@
 
     <select id="selectSubAgencyList" resultType="com.epmet.dto.result.AgencySubResultDTO">
         SELECT
-            id AS "agencyId",
-            organization_name AS "agencyName",
-            pids AS "pids"
-        FROM customer_agency
-        WHERE del_flag = '0'
-        AND pids = #{subAgencyPids}
-        ORDER BY created_time DESC
+            ca.id AS "agencyId",
+            ca.organization_name AS "agencyName",
+            ca.pids AS "pids",
+            ca.level level,
+	        ( 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_agency ca
+        WHERE ca.del_flag = '0'
+        AND ca.pids = #{subAgencyPids}
+        ORDER BY ca.created_time DESC
     </select>
 
     <select id="getCustomerRootAgency" resultType="com.epmet.dto.CustomerAgencyDTO">