Merge branch 'develop_tzs_register_to_0715' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/DPStatisticsMapper.xml

@@ -638,7 +638,10 @@
             ) T
     </select>
     <select id="selectNoticeList" resultType="java.util.Map">
-        SELECT
+        select
+        *
+        from
+        ( SELECT
             CONCAT ( T.city_name, T.county_name ) AS location,
             T.install_unit_name AS constructionCompany,
             T.use_unit_name AS useCompany,
@@ -681,7 +684,8 @@
             tzs_jg_transfer_notice T
         WHERE
             plan_date &gt;= #{time}
-          AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )
+          AND T.receive_company_org_code LIKE CONCAT ( #{orgCode}, '%' )) A
+        ORDER BY A."constructionDate" DESC
     </select>
     <select id="selectNoticeCountTopTen" resultType="java.util.Map">
         SELECT SUM( T.num ) AS count,
@@ -737,5 +741,6 @@
             T.install_unit_credit_code
         ORDER BY
             COUNT DESC
+        limit 10
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/YJDPStatisticsServiceImpl.java

@@ -171,9 +171,9 @@ public class YJDPStatisticsServiceImpl {
             Map<String, Long> addressNumMap = maps.stream().collect(Collectors.toMap(CountDto::getKeyStr, CountDto::getLongValue));
             ydata = dataDictionaries.stream().map(d -> {
                 Long num = 0L;
-                // 目前USE_PLACE字段存放字典的id
-                if (addressNumMap.get(d.getSequenceNbr().toString()) != null) {
-                    num = addressNumMap.get(d.getSequenceNbr().toString());
+                // 目前USE_PLACE字段存放字典的code
+                if (addressNumMap.get(d.getCode()) != null) {
+                    num = addressNumMap.get(d.getCode());
                 }
                 // 数据库中老数据历史问题存放字典的name,兼容对老数据的统计
                 if (addressNumMap.get(d.getName()) != null) {