Merge branch 'dev' of…

Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

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

@@ -40,7 +40,8 @@ public interface PersonPostMapper {
             " WHERE 1=1" +
             " <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>" +
+            " <if test='state== 0 '> and  PERSON_POST.print_date is null  </if>" +
+            " <if test='state== 1 '> and  PERSON_POST.print_date is not null  </if>" +
             " <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!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>" +
@@ -58,7 +59,8 @@ public interface PersonPostMapper {
             " where 1=1 " +
             " <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='state== 0 '> and  PERSON_POST.print_date is null  </when>" +
+            " <when test='state== 1 '> and  PERSON_POST.print_date is not null  </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!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>" +
@@ -71,7 +73,7 @@ public interface PersonPostMapper {
             "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='state!= null '> and  PERSON_POST.STATE=#{state} </when>" +
             " <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>")

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

@@ -53,7 +53,6 @@ public class PersonPostServiceImpl implements PersonPostService {
         personPostMapper.updateIsPost(fileId,creatTime);
         return true;
     }
-    //TODO
     @Override
     public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize){
         String str = null;
@@ -110,7 +109,6 @@ public class PersonPostServiceImpl implements PersonPostService {
             }
         }
           int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate);
-        System.out.println( "1111111111111111111count:"+count);
         return count;
     }
 

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

@@ -57,8 +57,7 @@
                <tr>
                     <td>禁用:</td>
                     <td style="text-align: left;">
-                         <select class="form-control select2" id="packageType"
-                           ng-model="packageType">
+                         <select class="form-control select2" id="packageType">
                                  <option value="">--请选择禁用状态--</option>
                                  <option value="0">是</option>
                                  <option value="1">否</option>

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

@@ -56,8 +56,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             if(angular.isUndefined($scope.sljg)){
                 $scope.sljg='';
             }
-            if(angular.isUndefined(packageType)){
-                packageType='';
+            if(packageType==''){
+                packageType=-1;
             }
             HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
                 cardType,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
@@ -113,8 +113,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
             }else{
                 url = url + 'cardType=' + cardType + '&';
             }
-            if(angular.isUndefined(packageType)){
-                url = url + 'state=&';
+            if(packageType==''){
+                url = url + 'state=-1&';
             }else{
                 url = url + 'state=' + packageType + '&';
             }

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

@@ -48,7 +48,7 @@
                           ng-model="isPrint">
                                 <option value="">--请选择打印状态--</option>
                                 <option value="1">已打印</option>
-                                <option value="-1">未打印</option>
+                                <option value="0">未打印</option>
                             </select>
                    </td>
                    <td >格口:</td>

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

@@ -55,10 +55,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.orderNumber='';
             }
-            if ($("#print").val() == 1 || $("#print").val() == -1) {
-                json.state=$("#print").val();
+            if ($("#print").val() == '') {
+                json.state=-1;
             }else {
-                json.state='';
+                json.state=$("#print").val();
             }
             if (angular.isDefined($scope.gkxx)) {
                 json.latticeMouthInformation = $scope.gkxx
@@ -86,10 +86,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.orderNumber='';
             }
-            if ($("#print").val() == 1 || $("#print").val() == -1) {
-                json.state=$("#print").val();
+            if ($("#print").val() == '') {
+                json.state=-1;
             }else {
-                json.state='';
+                json.state=$("#print").val();
             }
             if (angular.isDefined($scope.gkxx)) {
                 json.latticeMouthInformation = $scope.gkxx