解析更改

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

@@ -26,7 +26,7 @@ public class queryPreproPerson {
      */
     @RequestMapping("queryPreproPerson")
 //    @RequiresPermissions("userInfo.add")//权限管理;
-    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){
+    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

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

@@ -73,7 +73,7 @@ public interface LogMapper {
             "SELECT * FROM " +
             "            ( " +
             "            SELECT A.*, ROWNUM RN " +
-            "            FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC " +
+            "            FROM (SELECT distinct NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC " +
             "            FROM NEW_FILES " +
             "            RIGHT JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
             "            where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null " +
@@ -99,8 +99,11 @@ public interface LogMapper {
     @Select("select * from COUNTY_DIC")
     public List<CountyDicEntity> getCountyListData();
 
+    //新包日志总数
     @Select("<script> " +
-            "SELECT COUNT(*) fileCount, PREPRO_PERSON.NEW_FILE_ID FROM NEW_FILES LEFT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null  " +
+            "SELECT COUNT(*) FILECOUNT FROM (SELECT distinct NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC FROM NEW_FILES \n" +
+            "RIGHT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 \n" +
+            "and PREPRO_PERSON.NEW_FILE_ID is not null  " +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
@@ -111,9 +114,8 @@ public interface LogMapper {
             "            and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
             "            </if>" +
             "            <if test='cardId !=\"\"' >" +
-            "            and PREPRO_PERSON.GMSFHM=#{cardId} " +
-            "            </if>" +
-            " group by PREPRO_PERSON.NEW_FILE_ID" +
+            "            and PREPRO_PERSON.GMSFHM=#{cardId}" +
+            "            </if> )" +
             "</script>")
     public List<Map<String,Object>> selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
 

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

@@ -46,8 +46,8 @@ public interface PreproPersonMapper {
             " <if test='cardType != null  '>"+
             " and PREPRO_PERSON.CARD_TYPE_ID =#{cardType}"+
             " </if> "+
-            " <if test='state != null '>"+
-            " and  PREPRO_PERSON.state = #{state}"+
+            " <if test='state != -1 '>"+
+            " and  PREPRO_PERSON.is_valid = #{state}"+
             " </if>  "+
             " <if test='uploadDate != null '>"+
             " and to_char(UPLOAD_DATE,'yyyyMMdd') = #{uploadDate}"+