页面调整

src/main/java/com/yxproject/start/mapper/PersonPostMapper.java

@@ -51,7 +51,7 @@ public interface PersonPostMapper {
             " <when test='getToCounty!=\"\"'> and  PERSON_POST.GET_TO_COUNTY  in ( ${getToCounty})  </when>" +
             " <when test='startDate!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8) between ${startDate} and ${endDate} </when>" +
             " <when test='printDate!=\"\"'> and  to_char(PERSON_POST.print_Date,'yyyyMMdd') = ${printDate} </when>" +
-            "order by PERSON_POST.id ) " +
+            "order by substr(PERSON_POST.first_white,10,13) ) " +
             "A" +
             ")" +
             "WHERE RN BETWEEN ${pageSize} AND ${firstIndex}" +

src/main/resources/static/js/service.js

@@ -1904,7 +1904,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 })
             },
             loadCertificationDiagram: function (date,success, failed) {
-                console.log(date);
                 $http({method: 'post',
                     url: "../Cartogram/findCardDetailedList"+urlTimeStamp(),
                     data:date

src/main/resources/static/js/utils.js

@@ -10,10 +10,10 @@ var urlTimeStamp = function () {
 //条形统计图 建立
 var buildDiagramDataCheckItemRatioProv = function (labelprov, data) {
     var body = {
-        color: ['#003366', '#006699', '#4cabce', '#e5323e'],
+        color: ['#003366', '#006699', '#4cabce', '#00a65a', '#e5323e'],
         title : {
             text: ' 北京市公安局 '+data.date+' 年异地证制证生产情况',
-            subtext: '人次数量'
+            subtext: '人次/数量'
         },
         //提示框组件
         tooltip: {
@@ -24,7 +24,7 @@ var buildDiagramDataCheckItemRatioProv = function (labelprov, data) {
             type: 'scroll',
             orient: 'horizontal',
             x: 'right',
-            data: ['异地证','港澳','台湾','废证']
+            data: ['异地证','港澳','台湾','个人邮寄','废证']
         },
         //拖拽时，是否实时更新。
         calculable: true,
@@ -69,6 +69,12 @@ var buildDiagramDataCheckItemRatioProv = function (labelprov, data) {
                 label: labelprov,
                 data: data.tw
             },
+            {
+                name: '个人邮寄',
+                type: 'bar',
+                label: labelprov,
+                data: data.gr
+            },
             {
                 name: '废证',
                 type: 'bar',

src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html

@@ -159,7 +159,7 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr ng-repeat="item in postData | orderBy:item.id">
+                        <tr ng-repeat="item in postData">
                             <td>{{$index+1}}</td>
                             <td>{{item.orderNumber}}</td>
                             <td>{{item.waybillNumber}} -