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

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

@@ -53,7 +53,7 @@ public interface LogMapper {
             " LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID = ANALYSIS.FILE_DIC_ID "+
             "WHERE  1=1" +
             "<if test='fileName !=\"\"' >" +
-            " and FILE_NAME_DIC.FILE_NAME=#{fileName} " +
+            " and FILES.SOURCE_FILE_NAME=#{fileName} " +
             "</if>" +
             "<if test='analysisDate !=\"\"' >" +
             "AND subStr(FILE_NAME_DIC.ANALYSIS_DATE,0,8) =subStr( #{analysisDate},0,8) " +
@@ -73,7 +73,8 @@ public interface LogMapper {
             "SELECT * FROM " +
             "            ( " +
             "            SELECT A.*, ROWNUM RN " +
-            "            FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC FROM NEW_FILES " +
+            "            FROM (SELECT 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 " +
             "            <if test='newFileName !=\"\"' >" +
@@ -118,14 +119,15 @@ public interface LogMapper {
     public int selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
 
 
+    // TODO  解析日志总数
     @Select("<script> " +
             "SELECT COUNT(*)  FROM FILE_NAME_DIC \n" +
             "LEFT JOIN PERSON_POST ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " +
-            "LEFT JOIN FILES ON FILES.ID=FILE_NAME_DIC.FILE_ID " +
-            "left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = person_post.FIRST_WHITE " +
+            "LEFT JOIN ANALYSIS ON ANALYSIS.FILE_DIC_ID = FILE_NAME_DIC.FILE_ID "+
+            "LEFT JOIN FILES ON FILES.ID=ANALYSIS.FILE_ID " +
             "where 1=1 " +
             "<if test='fileName !=\"\"' >" +
-            "and NEW_FILES.NEW_FILE_NAME=#{fileName} " +
+            "and FILES.SOURCE_FILE_NAME=#{fileName} " +
             "</if>" +
             "<if test='analysisDate !=\"\"' >" +
             "AND subStr(FILE_NAME_DIC.ANALYSIS_DATE,0,8) = #{analysisDate} " +