Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/api/LogApi.java

@@ -54,8 +54,8 @@ public class LogApi {
      *
      */
     @RequestMapping("selectNewFileLogCount")
-    public String selectNewFileLogCount(@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId,@RequestParam("createDate")String createDate,@RequestParam("uploadCountyCode")String uploadCountyCode){
-        String total = logService.selectNewFileLogCount(newFileName,cardId,replaceDate(createDate),uploadCountyCode);
+    public int selectNewFileLogCount(@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId,@RequestParam("createDate")String createDate,@RequestParam("uploadCountyCode")String uploadCountyCode){
+        int total = logService.selectNewFileLogCount(newFileName,cardId,replaceDate(createDate),uploadCountyCode);
        return total;
     }
 
@@ -80,8 +80,8 @@ public class LogApi {
      * @return
      */
      @RequestMapping("selectAnalysisLogCount")
-     public String selectAnalysisLogCount (@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime){
-         String total = logService.selectAnalysisLogCount(fileName,replaceDate(analysisTime));
+     public int selectAnalysisLogCount (@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime){
+         int total = logService.selectAnalysisLogCount(fileName,replaceDate(analysisTime));
          return total;
      }
 

src/main/java/com/yxproject/start/api/PersonPostApi.java

@@ -57,10 +57,9 @@ public class PersonPostApi {
         String orderNumber = jsonObject.getString("orderNumber");
         String state = jsonObject.getString("state");
         String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
-        List<String> getToCounty = new ArrayList<>();
-        getToCounty.add(jsonObject.getString("getToCounty"));
-        String uploadDate = jsonObject.getString("uploadDate");
-        int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,getToCounty,uploadDate);
+        JSONArray jsonArray =(JSONArray)jsonObject.get("getToCounty");
+        String uploadDate = replaceDate(jsonObject.getString("uploadDate"));
+        int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,jsonArray,uploadDate);
         return count;
     }
 

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

@@ -2,8 +2,6 @@ package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.CountyDicEntity;
 import org.apache.ibatis.annotations.*;
-import org.omg.CORBA.PUBLIC_MEMBER;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -116,7 +114,7 @@ public interface LogMapper {
             "            and PREPRO_PERSON.GMSFHM=#{cardId} " +
             "            </if>" +
             "</script>")
-    public String selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate,@Param("uploadCountyCode") String uploadCountyName);
+    public int selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
 
 
     @Select("<script> " +
@@ -131,9 +129,6 @@ public interface LogMapper {
             "<if test='analysisDate !=\"\"' >" +
             "AND FILE_NAME_DIC.ANALYSIS_DATE = #{analysisDate} " +
             "</if>" +
-            "group by FILE_NAME_DIC.FILE_NAME, FILE_NAME_DIC.FORM_START_TIME, " +
-            "FILE_NAME_DIC.FORM_DEADLINE, PERSON_POST.LATTICE_MOUTH_INFORMATION, " +
-            "FILE_NAME_DIC.ANALYSIS_DATE, FILES.RECORD_NUMBER" +
             "</script>")
-    public String selectAnalysisLogCount(@Param("fileName")String fileName, @Param("analysisDate")String analysisDate);
+    public int selectAnalysisLogCount(@Param("fileName")String fileName, @Param("analysisDate")String analysisDate);
 }

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

@@ -33,12 +33,9 @@ public interface PersonPostMapper {
             "SELECT * FROM " +
             "( " +
             "SELECT A.*, ROWNUM RN " +
-            " from (SELECT PERSON_POST.ORDER_NUMBER,PERSON_POST.WAYBILL_NUMBER,PERSON_POST.BACK_WAYBILL_NUMBER,PROD_CARD_T.ACCEPT_NO,PERSON_POST.APPLICANT_NAME,PERSON_POST.RECIPIENT_PHONE,PERSON_POST.RECIPIENT_ADDRESS,PERSON_POST.PRINT_DATE" +
+            " from (SELECT PERSON_POST.*" +
             " FROM PERSON_POST " +
-            " LEFT JOIN  FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID" +
-            " LEFT JOIN  PREPRO_PERSON ON PERSON_POST.ID_CARD=PREPRO_PERSON.GMSFHM" +
-            " LEFT JOIN  PROD_CARD_T@PROD_LINK ON PROD_CARD_T.UPLOAD_NO = PREPRO_PERSON.JMSFZSLH" +
-
+            " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID  " +
             " WHERE 1=1" +
             " <when test='applicantName!=\"\"'> and  PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
@@ -47,25 +44,25 @@ public interface PersonPostMapper {
             " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY  in ( #{getToCounty} ) </when>" +
             " <when test='uploadDate!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>" +
             ") " +
-            "A" +
-            ")" +
+            "A"  +
+            ")"  +
             "WHERE RN BETWEEN #{pageSize} AND #{firstIndex}" +
             "</script>")
     public List<PersonPostEntity> findAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,@Param("getToCounty")String getToCounty,@Param("uploadDate")String uploadDate,@Param("firstIndex")long firstIndex,@Param("pageSize")long pageSize);
 
 
     @Select("<script> " +
-            "SELECT COUNT(*)  FROM NEW_FILES \n" +
-            "LEFT JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID " +
+            "SELECT COUNT(*)  FROM PERSON_POST \n" +
+            " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID  " +
             " where 1=1 " +
-            " <when test='applicantName!=null'> and  PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
-            " <when test='orderNumber!=null'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
-            " <when test='state!=null'> and  PERSON_POST.STATE=#{state} </when>" +
-            " <when test='latticeMouthInformation!=null'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
+            " <when test='applicantName!=\"\"'> and  PERSON_POST.APPLICANT_NAME = #{applicantName} </when>" +
+            " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
+            " <when test='state!=\"\"'> and  PERSON_POST.STATE=#{state} </when>" +
+            " <when test='latticeMouthInformation!=\"\"'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
             " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY  in ( #{getToCounty} ) </when>" +
-            " <when test='uploadDate!=null'> and  FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>" +
+            " <when test='uploadDate!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>" +
             "</script>")
-    public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("uploadDate") String uploadDate);
+    public int findPersonalDataCount( @Param("applicantName")String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") String getToCounty,@Param("uploadDate") String uploadDate);
 
 
 
@@ -77,7 +74,7 @@ public interface PersonPostMapper {
             " <when test='latticeMouthInformation!=null'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
             " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY in ( #{getToCounty}) </when>" +
             " <when test='uploadDate!=null'> and  FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>")
-    public boolean deleteAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,List<String> getToCounty ,@Param("uploadDate")String uploadDate);
+    public boolean deleteAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty ,@Param("uploadDate")String uploadDate);
 
 
 

src/main/java/com/yxproject/start/service/LogService.java

@@ -10,11 +10,11 @@ public interface LogService {
 
     public List<Map<String,Object>> selectNewFilesLog(String newFileName,String cardId,String createDate,String uploadCountyCode,long currPage,long pageSize);
 
-    public String selectNewFileLogCount(String newFileName,String cardId,String createDate,String uploadCountyCode);
+    public int selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode);
 
     public List<Map<String,Object>> selectAnalysisLog(String fileName,String analysisDate,long currPage,long pageSize);
 
-    public String selectAnalysisLogCount(String fileName,String analysisDate);
+    public int selectAnalysisLogCount(String fileName, String analysisDate);
 
     public List<CountyDicEntity> getCountyList();
 

src/main/java/com/yxproject/start/service/PersonPostService.java

@@ -3,6 +3,7 @@ package com.yxproject.start.service;
 import com.yxproject.start.dto.ReadCardDto;
 import com.yxproject.start.entity.FileNameDicEntity;
 import com.yxproject.start.entity.PersonPostEntity;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -23,7 +24,7 @@ public interface PersonPostService {
 
     public boolean savePersonPost(List<PersonPostEntity> personPostEntities);
 
-    public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize);
+    public List<PersonPostEntity> findPersonalData(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("uploadDate") String uploadDate,@Param("firstIndex") String firstIndex,@Param("pageSize") String pageSize);
 
     public boolean deletePersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate);
 

src/main/java/com/yxproject/start/service/impl/LogServiceImpl.java

@@ -20,8 +20,8 @@ public class LogServiceImpl implements LogService {
     }
 
     @Override
-    public String selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) {
-        String count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode);
+    public int selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) {
+        int count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode);
         return count;
     }
 
@@ -32,8 +32,8 @@ public class LogServiceImpl implements LogService {
     }
 
     @Override
-    public String selectAnalysisLogCount(String fileName, String analysisDate) {
-        String count= logMapper.selectAnalysisLogCount(fileName,analysisDate);
+    public int selectAnalysisLogCount(String fileName, String analysisDate) {
+        int count= logMapper.selectAnalysisLogCount(fileName,analysisDate);
         return count;
     }
 

src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java

@@ -64,6 +64,7 @@ public class PersonPostServiceImpl implements PersonPostService {
             }
         }
        List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,firstIndexLong * pageSizeLong,(firstIndexLong - 1) * pageSizeLong + 1);
+        System.out.println("数据："+list);
         return list;
     }
 
@@ -89,7 +90,16 @@ public class PersonPostServiceImpl implements PersonPostService {
 
     @Override
     public int findPersonalDataCount(@Param("applicantName") String applicantName,@Param("orderNumber") String orderNumber,@Param("state") String state,@Param("latticeMouthInformation") String latticeMouthInformation,@Param("getToCounty") List<String> getToCounty,@Param("uploadDate") String uploadDate) {
-          int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,getToCounty,uploadDate);
+        String str = null;
+        for (int i = 0;i<getToCounty.size();i++){
+            if (i==getToCounty.size()-1){
+                str+="'"+getToCounty.get(i)+"'";
+            }else {
+                str+="'"+getToCounty.get(i)+"',";
+            }
+        }
+          int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate);
+        System.out.println( "1111111111111111111count:"+count);
         return count;
     }
 

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

@@ -83,7 +83,7 @@
 
         </tbody>
     </table>
-    <div style="padding-left: 27%;">
+    <div style="padding-left: 27%;" ng-if="resultData.length>0">
         <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
     </div>
 </div>

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",
@@ -433,7 +434,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                         date:date
                     }
                 }).then(function successCallback(response) {
-                    console.log(response.data)
                     success(response.data)
                 })
             },
@@ -449,7 +449,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                         pageSize:pageSize
                     }
                 }).then(function successCallback(response) {
-                    console.log(response.data)
                     success(response.data)
                 })
             },
@@ -462,7 +461,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     data: body,
                     headers: {'Content-Type': 'application/json'}
                 }).then(function successCallback(response) {
-                    console.log(response.data)
                     success(response.data)
                 })
             },

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

@@ -74,7 +74,7 @@
                         <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
                         <td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
                         <td class="mailbox-name"><a>{{task.countyName}}</a></td>
-                        <td class="mailbox-subject">{{task.groupCount}}</td>
+                        <td class="mailbox-subject">{{task.groupList.length}}</td>
                         <td class="mailbox-subject">{{task.groupNum}}</td>
                         <td class="mailbox-attachment">{{task.countyValidCount}}</td>
                         <td class="mailbox-date">{{task.countyInvalidCount}}</td>

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,
@@ -154,14 +155,15 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
                     date:$('#datepicker').val(),
                     name:$rootScope.loginData.name,
                     countyList:arr,
-                    groupList:groupList,
-                    tag:0
+                    groupList:groupList
                 }
                 console.log(map)
                 HttpService.createTask(map,function(data){
-                    MessageService.showAlert("创建成功")
+                    console.log(data)
+                    MessageService.showAlert(data.msg)
                     console.log($scope.searchCurrent)
                     $scope.searchCurrent();
+                    $scope.selected=[];
                 })
             }else{
                 MessageService.showAlert("请选择创建任务单的组")

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.taskId)">组号列表</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/excelAndSearch/excelAndSearch.html

@@ -140,7 +140,7 @@
                     </tr>
                     </tbody>
                 </table>
-            <div style="padding-left: 27%;" >
+            <div style="padding-left: 27%;" ng-if="postPackageData>0">
                 <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
             </div>
             <div class="box-body" ng-if="postPackageData.length==0"><h4>暂无记录</h4></div>

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

@@ -57,7 +57,7 @@
                      <td style="text-align: left;">
                           <select class="form-control select2" id="county" multiple="multiple" data-placeholder="--请选择区县--"
                                   style="width: 100%;" ng-model="currentCounty">
-                                  <option value="{{county}}" ng-repeat="county in countyList track by $index">{{county}}</option>
+                                  <option value="{{county.countyCode}}" ng-repeat="county in countyList">{{county.countyName}}</option>
                           </select>
                      </td>
                </tr>
@@ -109,7 +109,7 @@
                             <td>{{item.waybillNumber}}</td>
                             <td>{{item.backWaybillNumber}}</td>
                             <td>{{item.firstWhite}}</td>
-                            <td>{{item.recipientName}}</td>
+                            <td>{{item.applicantName}}</td>
                             <td>{{item.recipientPhone}}</td>
                             <td>{{item.recipientAddress}}</td>
                             <td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>

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

@@ -29,7 +29,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
         });
 
         HttpService.getCountyListData(function (data) {
-            $scope.countyList = data
+            $scope.countyList = data;
         })
 
 
@@ -65,7 +65,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             if ($("#county").val() != null) {
                 json.getToCounty=$("#county").val();
             }else{
-                json.getToCounty='';
+                json.getToCounty=[];
             }
             json.uploadDate = $("#datepicker").val();
             return json;
@@ -98,13 +98,15 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.getToCounty=[];
             }
-            json.uploadDate = $("#datepicker").val();
+            if($("#datepicker").val()==''){
+                json.uploadDate = $filter("date")(new Date(), "yyyy-MM-dd");
+            }else{
+                json.uploadDate = $("#datepicker").val();
+            }
             json.firstIndex=$scope.paginationConf.currentPage;
             json.pageSize=$scope.paginationConf.itemsPerPage;
             return json;
         }
-        $scope.postData = [];
-        $scope.paginationConf.totalItems = 0
         $scope.doQuery = function () {
             HttpService.getRecordsCount(getCountJson(), function (data) {
                 $scope.paginationConf.totalItems = data;
@@ -121,9 +123,38 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
         $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery);
 
 
+        var getCountAndDownloadUrl = function (url) {
 
+            if (angular.isDefined($scope.applicantName)) {
+                url = url + 'sqrxm=' + $scope.applicantName + '&';
+            }
+            if (angular.isDefined($scope.orderNo)) {
+                url = url + 'ddh=' + $scope.orderNo + '&';
+            }
+            if (angular.isDefined($scope.number)) {
+                url = url + 'sequence=' + $scope.number + '&';
+            }
+            if ($("#print").val() == 1 || $("#print").val() == -1) {
+                url = url + 'hasPrinted=' + $("#print").val() + '&';
+            }
+            if (angular.isDefined($scope.gkxx)) {
+                url = url + 'gkxx=' + $scope.gkxx + '&';
+            }
+            if ($("#county").val() != null) {
+                for (var i = 0; i < $("#county").val().length; i++) {
+                    url = url + 'djx=' + ($("#county").val())[i] + '&';
+                }
+            }
+            if ($("#datepicker").val() == '') {
+                url = url + 'gmtCreat=' + $scope.choseDate + '&';
+            }
+            if ($("#datepicker").val() != '') {
+                url = url + 'gmtCreat=' + $("#datepicker").val() + '&';
+            }
+            return url + 't=' + Math.floor(Date.now());
+        }
         $scope.downloadExcel = function(){
-            var url = '../api/idCard/download?';
+            var url = '../personPostApi/download?';
             var a = document.createElement("a");
             document.body.appendChild(a);
             a.href = encodeURI(getCountAndDownloadUrl(url));