Merge remote-tracking branch 'origin/dev' 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>" +
+            " <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>" +
@@ -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

@@ -110,7 +110,6 @@ public class PersonPostServiceImpl implements PersonPostService {
             }
         }
           int count=personPostMapper.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate);
-        System.out.println( "1111111111111111111count:"+count);
         return count;
     }