push

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

@@ -30,6 +30,7 @@ public class queryPreproPerson {
     public Map<String,Object> printXmlData(@RequestParam("uploadNo") String uploadNo, @RequestParam("IDCard")String IDCard,@RequestParam("oldFile") String oldFile, @RequestParam("newFile")String newFile, @RequestParam("SSXQDM")String SSXQDM, @RequestParam("cardType")String cardType, @RequestParam("state")String state, @RequestParam("uploadDate")String uploadDate,@RequestParam("currPage")String currPage,@RequestParam("pageSize")String pageSize, HttpServletResponse response){
         List<Map<String, Object>> preproPersonEntities = preproPersonService.selectPreproPerson(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate),currPage,pageSize);
         Map<String,Object> map = new LinkedHashMap<>();
+        //todo 
         List<PreproPersonEntity> preproPersonEntityList = preproPersonService.selectPreproPersonCount(uploadNo, IDCard, oldFile, newFile, SSXQDM, cardType, state, replaceDate(uploadDate));
         map.put("total",preproPersonEntityList.size());
         int youSum =0;

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

@@ -25,7 +25,7 @@ public interface PreproPersonMapper {
 
 
       /*按条件查询制证数据*/
-    @Select({"<script> select JMSFZSLH,xm,XBDM,GMSFHM,SOURCE_FILE_NAME,NEW_FILE_NAME  from (select a.*,rownum rn from(select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID " +
+    @Select({"<script> select JMSFZSLH,xm,XBDM,GMSFHM,CARD_TYPE,IS_VALID,SOURCE_FILE_NAME,NEW_FILE_NAME  from (select a.*,rownum rn from(select * from PREPRO_PERSON left join files on PREPRO_PERSON.FILE_ID = files.ID left join NEW_FILES on PREPRO_PERSON.FILE_ID = NEW_FILES.ID left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = PREPRO_PERSON.CARD_TYPE_ID " +
             "<where> " +
             " 1=1" +
             "<if test='uploadNo != null '>" +