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

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

@@ -39,7 +39,7 @@ public interface PersonPostMapper {
             " 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='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER = #{emailNo} </when>" +
+            "<when test='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER = TO_NUMBER(#{emailNo}) </when>" +
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </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>" +
@@ -59,7 +59,7 @@ public interface PersonPostMapper {
             " 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='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER = #{emailNo} </when>" +
+            " <when test='emailNo!=\"\" '> and  PERSON_POST.WAYBILL_NUMBER =TO_NUMBER(#{emailNo}) </when>" +
             " <when test='orderNumber!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </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>" +
@@ -112,7 +112,7 @@ public interface PersonPostMapper {
             " <when test='ddh!=\"\"'> and  PERSON_POST.ORDER_NUMBER=#{ddh} </when>" +
             " <when test='hasPrinted!=\"\"'> and  PERSON_POST.STATE=#{hasPrinted} </when>" +
             " <when test='gkxx!=\"\"'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{gkxx} </when>" +
-            " <when test='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER=#{emailNo} </when>" +
+            " <when test='emailNo!=\"\"'> and  PERSON_POST.WAYBILL_NUMBER=TO_NUMBER(#{emailNo}) </when>" +
             " <when test='str!=null'> and  PERSON_POST.GET_TO_COUNTY  in ( #{str} ) </when>" +
             " <when test='uploadDate!=\"\"'> and  subStr(FILE_NAME_DIC.UPLOAD_DATE,0,8)=#{uploadDate} </when>"+
             "</script>")