新增页面

src/main/resources/static/dialogs/policeList.html

 <style>
-    .table th, .table td {
-            text-align: center;
-            vertical-align: middle!important;
-        }
     .ul li{
            cursor: pointer;
         }
@@ -31,7 +27,7 @@
     <table class="table" style="border-color: black;">
         <thead>
             <tr>
-                <th><input type="checkbox"></th>
+                <th ng-if="show"><input type="checkbox"></th>
                 <th>组号</th>
                 <th>合格数量</th>
                 <th>不合格数量</th>
@@ -43,7 +39,7 @@
         </thead>
         <tbody>
             <tr ng-repeat="groups in policeList">
-                <td><input type="checkbox"></td>
+                <td ng-if="show"><input type="checkbox"></td>
                 <td>{{groups.GROUP_NO}}</td>
                 <td>{{groups.VALID_COUNT}}</td>
                 <td>{{groups.INVALID_COUNT}}</td>

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

@@ -132,6 +132,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
             },
             getRecordsCount: function (data, success) {
                 var body = JSON.stringify(data);
+                console.log(body)
                 $http({
                     method: 'POST',
                     url: "../personPostApi/findPersonalDataCount",

src/main/resources/static/views/createTaskList/createTaskList.js

@@ -61,6 +61,7 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                 cache: false,
                 closeByDocument:false,
                 controller: ['$scope', 'HttpService',function ($scope,HttpService) {
+                    $scope.show = true;
                     console.log($('#datepicker').val(),countyCode,typeCode);
                     $scope.paginationConf = {
                         currentPage: 1,

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

@@ -45,8 +45,8 @@
                     <th></th>
                 </tr>
               </thead>
-              <tbody>
-              <tr ng-repeat="task in type.countyList">
+              <tbody ng-repeat="task in type.countyList">
+              <tr>
                 <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
                 <td class="mailbox-star"><b>{{task.taskId}}</b></td>
                 <td class="mailbox-name"><a>{{task.countyName}}</a></td>
@@ -57,9 +57,33 @@
                 <td class="mailbox-date" ng-if="task.faileCount==0">{{task.faileCount}}</td>
                 <td class="mailbox-date text-danger" ng-if="task.faileCount!=0">{{task.faileCount}}</td>
                 <td class="mailbox-date">{{task.specialCount}}</td>
-                <td class="mailbox-date"><a ng-click="getPoliceList(task.countyCode,type.typeCode)">组号列表</a></td>
+                <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
+              </tr>
+               <tr ng-if="task.taskId==taskId">
+                  <td></td>
+                  <td colspan="10">
+                      <table class="table">
+                          <thead>
+                             <th>组号</th>
+                             <th>核验数量</th>
+                             <th>证件数量</th>
+                             <th>特殊证件数量</th>
+                             <th>废证数量</th>
+                             <th></th>
+                          </thead>
+                          <tbody>
+                               <tr ng-repeat="item in policeList">
+                                    <td>{{item.GROUP_NO}}</td>
+                                    <td>{{item.VALID_COUNT}}</td>
+                                    <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
+                                    <td>{{item.SPECIAL_CARD_COUNT}}</td>
+                                    <td>{{item.FAILECOUNT}}</td>
+                                    <td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
+                               </tr>
+                          </tbody>
+                      </table>
+                  </td>
               </tr>
-
               </tbody>
             </table>
             <!-- /.table -->

src/main/resources/static/views/dispatchTask/dispatchTask.js

@@ -109,30 +109,35 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
             $scope.currentTab = index;
         }
 
-        $scope.getPoliceList = function(countyCode,typeCode){
-            ngDialog.open({
-                template: 'dialogs/policeList.html' + urlTimeStamp(),
-                width: 800,
-                cache: false,
-                closeByDocument:false,
-                controller: ['$scope', 'HttpService',function ($scope,HttpService) {
-                    console.log($('#datepicker').val(),countyCode,typeCode);
-                    $scope.paginationConf = {
-                        currentPage: 1,
-                        itemsPerPage: 10,
-                        perPageOptions: [10, 20, 30, 40, 50]
-                    };
-                    var getGroupInfoList = function () {
-                        HttpService.getGroupListData($('#datepicker').val(),countyCode,typeCode,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
-                            $scope.paginationConf.totalItems = data.count;
-                            $scope.policeList =data.groupList;
+        $scope.taskId=1;
+        $scope.getPoliceList = function(groupList,taskId){
+            $scope.policeList = groupList;
+            if($scope.taskId==1){
+                $scope.taskId=taskId;
+            }else{
+                $scope.taskId=1
+            }
+            console.log(groupList)
+        }
+
+        $scope.getSpecialCardsInfo = function(groupNo,specialCardCount){
+            if(parseInt(specialCardCount)>0){
+                ngDialog.open({
+                    template: 'dialogs/specailCardInfo.html' + urlTimeStamp(),
+                    width: 600,
+                    cache: false,
+                    closeByDocument:false,
+                    controller: ['$scope', function ($scope) {
+                        HttpService.getSpecialCardData(groupNo,function(data) {
+                            $scope.specailCardData = data;
+                            console.log(data)
                         })
-                    }
-                    // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
-                    $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', getGroupInfoList);
+                    }]
+                });
+            }else{
+                MessageService.showAlert("该组中没有特殊证件")
+            }
 
-                }]
-            });
         }
 
         $scope.goes = function(){

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

@@ -30,7 +30,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
 
         HttpService.getCountyListData(function (data) {
             $scope.countyList = data;
-            console.log($scope.countyList)
         })
 
 
@@ -109,10 +108,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             return json;
         }
         $scope.doQuery = function () {
-            // HttpService.getRecordsCount(getCountJson(), function (data) {
-            //     $scope.paginationConf.totalItems = data;
-            //     console.log(data)
-            // })
+            HttpService.getRecordsCount(getCountJson(), function (data) {
+                $scope.paginationConf.totalItems = data;
+                console.log(data)
+            })
             HttpService.searchPostData(getJson(), function (data) {
                 $scope.postData = data;
                 console.log(data)