Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govproject/result/ProjectStatusListResultDTO.java

@@ -23,7 +23,7 @@ public class ProjectStatusListResultDTO implements Serializable {
     //经度
     private String longitude;
     //纬度
-    private String dimension;
+    private String latitude;
     //项目标题
     private String title;
 

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -163,7 +163,7 @@
             origin origin,
             `status` status,
             locate_longitude longitude,
-            locate_dimension dimension,
+            locate_dimension latitude,
             title title
         FROM
             project

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml

@@ -141,7 +141,7 @@
                 AND m.CATEGORY_CODE =#{firstCategoryCode}
             </if>
         ORDER BY
-            m.CREATED_TIME DESC
+            m.CREATED_TIME DESC,m.sort desc
     </select>
 
 
@@ -163,7 +163,7 @@
             AND m.CUSTOMER_ID = #{customerId}
             AND m.PARENT_CODE = #{parentCode}
         ORDER BY
-        m.CREATED_TIME DESC
+        m.CREATED_TIME DESC,m.sort desc
     </select>
 
 

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

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

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

@@ -1119,6 +1119,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         result.setAgencyName(rootAgency.getAgencyName());
         result.setAgencyId(rootAgency.getAgencyId());
         result.setLevel(rootAgency.getLevel());
+        result.setOrgLevel(rootAgency.getAgencyId().concat("-").concat(rootAgency.getLevel()));
         result.setLongitude(rootAgency.getLongitude());
         result.setLatitude(rootAgency.getLatitude());
         ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(rootAgency.getAgencyId());
@@ -1141,6 +1142,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 resultDTO.setLevel(agency.getLevel());
                 resultDTO.setLongitude(agency.getLongitude());
                 resultDTO.setLatitude(agency.getLatitude());
+                resultDTO.setOrgLevel(agency.getAgencyId().concat("-").concat(agency.getLevel()));
 
                 if (root.getSubAgencyList() == null) {
                     root.setSubAgencyList(new ArrayList<>());
@@ -1156,6 +1158,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
                 grid.setAgencyName(o.getGridName());
                 grid.setPid(root.getAgencyId());
                 grid.setLevel("grid");
+                grid.setOrgLevel(o.getGridId().concat("-").concat("grid"));
                 grid.setSubAgencyList(null);
                 grid.setLongitude(o.getLongitude());
                 grid.setLatitude(o.getLatitude());