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

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

@@ -13,7 +13,7 @@ import java.util.List;
  */
 @Mapper
 public interface PersonPostMapper {
-    @Update("insert into PERSON_POST " +
+    @Insert("insert into PERSON_POST " +
             "( WAYBILL_NUMBER,BACK_WAYBILL_NUMBER,ORDER_NUMBER,CREATE_DATE,OPENID,WC_PLAY_ORDER_NUMBER,PLAY_STATE,ORDER_STATE,APPLICANT_NAME,SENDER_NAME,SENDER_PHONE,SENDER_ADDRESS,RECIPIENT_NAME,RECIPIENT_PHONE,RECIPIENT_ADDRESS,ORDER_BLANK_NUMBER,GET_TO_PROVINCE,GET_TO_CITY,GET_TO_COUNTY,BUSINESS_TYPE,LATTICE_MOUTH_INFORMATION,NATURE_OF_THE_INTERNAL,NATURE_OF_THE_INFORMATION,FIRST_WHITE,FILE_ID) " +
             "values " +
             "(#{waybillNumber},#{backWaybillNumber},#{orderNumber},#{createDate},#{openid},#{wcPlayOrderNumber},#{playState},#{orderState},#{applicantName},#{senderName},#{senderPhone},#{senderAddress},#{recipientName},#{recipientPhone},#{recipientAddress},#{orderBlankNumber},#{getToProvince},#{getToCity},#{getToCounty},#{businessType},#{latticeMouthInformation},#{natureOfTheInternal},#{natureOfTheInformation},#{firstWhite},#{fileId})")

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

@@ -19,6 +19,9 @@ public interface PreproPersonService {
 
     public List<PreproPersonEntity> selectPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate,String currPage,String pageSize);
 
+    public List<PreproPersonEntity> selectAllPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
+
+
     public List<PreproPersonEntity> selectPreproPersonCount(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate);
 
     public boolean updatePreproPerson_NewFileName(List<PreproPersonEntity> preproPersonEntities);

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

@@ -25,7 +25,7 @@ public class PreproPersonServiceImpl implements PreproPersonService {
     }
 
     /**
-     * 查询制证数据详细信息
+     * 分页查询制证数据详细信息
      * @param uploadNo
      * @param IDCard
      * @param oldFile
@@ -44,6 +44,23 @@ public class PreproPersonServiceImpl implements PreproPersonService {
         return preproPersonEntities;
     }
 
+    /**
+     * 查询全部制证详细信息
+     * @param uploadNo
+     * @param IDCard
+     * @param oldFile
+     * @param newFile
+     * @param SSXQDM
+     * @param cardType
+     * @param state
+     * @param uploadDate
+     * @return
+     */
+    @Override
+    public List<PreproPersonEntity> selectAllPreproPerson(String uploadNo, String IDCard, String oldFile, String newFile, String SSXQDM, String cardType, String state, String uploadDate) {
+        return null;
+    }
+
     /**
      * 查询制证数据总数
      * @param uploadNo