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

# Conflicts:
#	src/main/java/com/yxproject/start/service/LogService.java

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

@@ -30,14 +30,14 @@ public class LogApi {
      * @param newFileName 新文件名
      * @param cardId 身份证号
      * @param createDate 生成时间
-     * @param uploadCountyName 上传地区
+     * @param uploadCountyCode 上传地区
      * @param currPage 页数
      * @param pageSize 行数
      * @return
      */
     @RequestMapping("selectNewFilesLog")
-    public List<Map<String,Object>> selectNewFilesLog (@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId, @RequestParam("createDate")String createDate, @RequestParam("uploadCountyName")String uploadCountyName, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
-        List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,createDate,uploadCountyName, Long.valueOf(currPage),Long.valueOf(pageSize));
+    public List<Map<String,Object>> selectNewFilesLog (@RequestParam("newFileName")String newFileName, @RequestParam("cardId")String cardId, @RequestParam("createDate")String createDate, @RequestParam("uploadCountyCode")String uploadCountyCode, @RequestParam("currPage")String currPage, @RequestParam("pageSize")String pageSize){
+        List<Map<String,Object>> result = logService.selectNewFilesLog(newFileName,cardId,createDate,uploadCountyCode, Long.valueOf(currPage),Long.valueOf(pageSize));
         return result;
     }
 

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

@@ -15,6 +15,7 @@ public interface LogMapper {
 
     @Insert("")
     public boolean insertAnalysisLog();
+
     @Select("")
     public List<Map<String,Object>> selectAnalysisLog(String fileName,String analysisDate);
 
@@ -28,21 +29,21 @@ public interface LogMapper {
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
-            "            <if test='cardId !=\"\"' >" +
-            "            and NEW_FILES.DWMC=#{cardId}" +
+            "            <if test='uploadCountyCode != -1' >" +
+            "            and NEW_FILES.DWDM=#{uploadCountyCode}" +
             "            </if>" +
             "            <if test='createDate !=\"\"' >" +
             "            and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
             "            </if>" +
-            "            <if test='uploadCountyName !=\"\"' >" +
-            "            and PREPRO_PERSON.GMSFHM=#{uploadCountyName} " +
+            "            <if test='cardId !=\"\"' >" +
+            "            and PREPRO_PERSON.GMSFHM=#{cardId} " +
             "            </if>" +
             "            ) " +
             "            A" +
             "            )" +
             "            WHERE RN BETWEEN #{end} AND #{begin}" +
             "</script>")
-    public List<Map<String,Object>> selectNewFilesLog(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate,@Param("uploadCountyName") String uploadCountyName, @Param("begin") long begin, @Param("end") long end);
+    public List<Map<String,Object>> selectNewFilesLog(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate,@Param("uploadCountyCode") String uploadCountyName, @Param("begin") long begin, @Param("end") long end);
 
     @Select("select * from COUNTY_DIC")
     public List<CountyDicEntity> getCountyListData();

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

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface LogService {
 
-    public List<Map<String,Object>> selectNewFilesLog(String newFileName,String cardId,String createDate,String uploadCountyName,long currPage,long pageSize);
+    public List<Map<String,Object>> selectNewFilesLog(String newFileName,String cardId,String createDate,String uploadCountyCode,long currPage,long pageSize);
 
     public List<CountyDicEntity> getCountyList();
 }

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

@@ -14,8 +14,8 @@ public class LogServiceImpl implements LogService {
     @Autowired
     private LogMapper logMapper;
     @Override
-    public List<Map<String, Object>> selectNewFilesLog(String newFileName, String cardId, String createDate, String uploadCountyName, long currPage, long pageSize) {
-        List<Map<String, Object>> resultMap= logMapper.selectNewFilesLog(newFileName,cardId,createDate,uploadCountyName,currPage * pageSize, (currPage - 1) * pageSize + 1);
+    public List<Map<String, Object>> selectNewFilesLog(String newFileName, String cardId, String createDate, String uploadCountyCode, long currPage, long pageSize) {
+        List<Map<String, Object>> resultMap= logMapper.selectNewFilesLog(newFileName,cardId,createDate,uploadCountyCode,currPage * pageSize, (currPage - 1) * pageSize + 1);
         return resultMap;
     }