修改查询新包日志

修改查询制证信息管理数据

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

@@ -2,6 +2,7 @@ package com.yxproject.start.api;
 
 import com.yxproject.start.entity.CountyDicEntity;
 import com.yxproject.start.service.LogService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,16 +36,13 @@ public class LogApi {
         List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,replaceDate(createDate),uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
         return result;
     }
+//    @RequestMapping("selectNewFilesLog")
+//    public List<Map<String,Object>> selectNewFilesLog (@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
+//        List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,replaceDate(createDate),uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
+//        return result;
+//    }
+
 
-    /**
-     * 查询公安局列表
-     * @return list
-     */
-    @RequestMapping("selectCountyList")
-    public List<CountyDicEntity> selectCountyList(){
-        List<CountyDicEntity> list = logService.getCountyList();
-        return list;
-    }
 
     /**
      * 查询新包生成日志总数
@@ -61,6 +59,16 @@ public class LogApi {
        return total;
     }
 
+    /**
+     * 查询公安局列表
+     * @return list
+     */
+    @RequestMapping("selectCountyList")
+    public List<CountyDicEntity> selectCountyList(){
+        List<CountyDicEntity> list = logService.getCountyList();
+        return list;
+    }
+
 
     /**
      * 查询解析日志

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

@@ -85,8 +85,8 @@ public interface LogMapper {
             "            SELECT A.*, ROWNUM RN " +
             "            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 " +
+            "            left JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
+            "            where 1=1  " +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
@@ -112,8 +112,7 @@ public interface LogMapper {
     //新包日志总数
     @Select("<script> " +
             "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  " +
+            "left JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 \n" +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +