修改验收bug

src/main/java/platform/modules/government/service/LandStatisticsService.java

@@ -1019,11 +1019,13 @@ public class LandStatisticsService {
 
         Map rentPassRateNumMap = new HashMap();
         rentPassRateNumMap.put("name", "存量工业用地房屋出租");
-        rentPassRateNumMap.put("streetNum", rentPassRate);
+        Object[] rentStrPassRate = Arrays.stream(rentPassRate).mapToObj(r -> r + "%").toArray();
+        rentPassRateNumMap.put("streetNum", rentStrPassRate);
 
         Map useChangePassRateNumMap = new HashMap();
         useChangePassRateNumMap.put("name", "存量工业用地用途依法改变");
-        useChangePassRateNumMap.put("streetNum", useChangePassRate);
+        Object[] useChangeStrPassRate = Arrays.stream(useChangePassRate).mapToObj(r -> r + "%").toArray();
+        useChangePassRateNumMap.put("streetNum", useChangeStrPassRate);
 
         Map immovablesChangePassRateNumMap = new HashMap();
         immovablesChangePassRateNumMap.put("name", "存量工业用地不动产权权属转移登记");

src/main/resources/templates/admin/government/land_statistic/plate.html

@@ -215,20 +215,21 @@
         <div id="processed_pie" class="chartLi" style="width:30%;"></div>
     </div>
 </div>
-<div class="date_tab_list clearfix">
-    <span class="date_tab_item active_date" data-type="-7">7天</span>
-    <span class="date_tab_item" data-type="-14">14天</span>
-    <span class="date_tab_item" data-type="-30">30天</span>
-    <input class="Wdate input-text" type="text" th:id="daily_monthly_start_time" th:name="daily_monthly_start_time"
-           style="float:left; width: 150px;border-right: none;"
-           onclick="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'daily_monthly_end_time\')}',isShowClear:true,readOnly:true,onpicked: function(){invokeGetDailyStatisticAndGetTypeStatistic()} })"/>
-    <input class="Wdate input-text" type="text" th:id="daily_monthly_end_time" th:name="daily_monthly_end_time"
-           style="float:left; width: 150px;"
-           onclick="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'daily_monthly_start_time\')}',isShowClear:true,readOnly:true,onpicked: function(){invokeGetDailyStatisticAndGetTypeStatistic()} })"/>
-</div>
+
 <div class="chartContent">
     <div class="title">每日统计</div>
     <div id="daily_type_line" style="width: 96%; height: 400px"></div>
+    <div class="date_tab_list clearfix">
+        <span class="date_tab_item active_date" data-type="-7">7天</span>
+        <span class="date_tab_item" data-type="-14">14天</span>
+        <span class="date_tab_item" data-type="-30">30天</span>
+        <input class="Wdate input-text" type="text" th:id="daily_monthly_start_time" th:name="daily_monthly_start_time"
+               style="float:left; width: 150px;border-right: none;"
+               onclick="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'daily_monthly_end_time\')}',isShowClear:true,readOnly:true,onpicked: function(){invokeGetDailyStatisticAndGetTypeStatistic()} })"/>
+        <input class="Wdate input-text" type="text" th:id="daily_monthly_end_time" th:name="daily_monthly_end_time"
+               style="float:left; width: 150px;"
+               onclick="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'daily_monthly_start_time\')}',isShowClear:true,readOnly:true,onpicked: function(){invokeGetDailyStatisticAndGetTypeStatistic()} })"/>
+    </div>
 </div>
 <div class="chartContent">
     <div class="title">周期分类统计</div>

src/main/resources/templates/admin/government/project_declaration/statistics.html

@@ -159,12 +159,23 @@
     //各街道申报数量
     function streetDeclaerNum(type) {
         $("#chartType").val(1);
+        var begin_date = $("#begin_date").val();
+        var end_date =$("#end_date").val();
+        if (end_date == "") end_date = getDay(0)
+        if (begin_date == "") {
+            if (type > 0){
+                begin_date = getDay(type)
+            } else {
+                begin_date = getDay(1)
+            }
+        }
+        initColumn.title.text = begin_date +"~"+ end_date +' 各街道申报项目数';
         $.ajax({
             type: "post",
             dataType: "json",
             data: {
-                begin_date: $("#begin_date").val(),
-                end_date: $("#end_date").val(),
+                begin_date: begin_date,
+                end_date: end_date,
                 type: type
             },
             url: pagePath + "/projectDeclaration/streetDeclaerNum/",
@@ -200,6 +211,11 @@
         });
     }
 
+    function getDay(minusYear) {
+        var currentday = new Date(new Date(new Date().toLocaleDateString()).getTime());
+        return (currentday.getFullYear()-minusYear) + "-" + ((currentday.getMonth() + 1) < 10 ? "0" + (currentday.getMonth() + 1):(currentday.getMonth() + 1))+ "-" + (currentday.getDate() < 10 ? "0" + currentday.getDate():currentday.getDate())
+    }
+
     //项目类别占比
     function projectCategoryRate(type) {
         $("#chartType").val(2);