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

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

@@ -84,7 +84,8 @@ public class LogApi {
      */
      @RequestMapping("selectAnalysisLogCount")
      public int selectAnalysisLogCount (@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime){
-         int total = logService.selectAnalysisLogCount(fileName,replaceDate(analysisTime));
+         System.out.println("11111111111111111111111111111"+analysisTime);
+         int total = logService.selectAnalysisLogCount(fileName,analysisTime);
          return total;
      }
 
@@ -113,8 +114,6 @@ public class LogApi {
          logService.insertAnalysisDate(df.format(new Date()),fileId);
          //查询XML文件信息
          List<Map<String,Object>> resultList = logService.selectFileIdByUploadDate(printDate);
-         System.out.println("00000000000000000000"+resultList.toString());
-
          //查询Excel文件信息
          Map<String, Object> resultMap = logService.selectFileNameDic(fileId);
          List<Map<String,Object>> result = new ArrayList<>();

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

@@ -46,7 +46,7 @@ public interface LogMapper {
             "( " +
             "SELECT A.*, ROWNUM RN " +
             "FROM (SELECT FILE_NAME_DIC.FILE_NAME,FILE_NAME_DIC.FORM_START_TIME," +
-            "FILE_NAME_DIC.FORM_DEADLINE,PERSON_POST.LATTICE_MOUTH_INFORMATION," +
+            "FILE_NAME_DIC.FORM_DEADLINE,PERSON_POST.FILE_ID," +
             "FILE_NAME_DIC.ANALYSIS_DATE,FILES.RECORD_NUMBER ," +
             "SUM(DECOdE(CARD_TYPE_ID,9,1,0)) youcount," +
             "SUM(DECOdE(CARD_TYPE_ID,0,1,0)) PUcount " +
@@ -59,10 +59,10 @@ public interface LogMapper {
             " and FILE_NAME_DIC.FILE_NAME=#{fileName} " +
             "</if>" +
             "<if test='analysisDate !=\"\"' >" +
-            "AND FILE_NAME_DIC.ANALYSIS_DATE = #{analysisDate} " +
+            "AND FILE_NAME_DIC.ANALYSIS_DATE =to_date( #{analysisDate},'yyyy-MM-dd') " +
             "</if>" +
             "group by FILE_NAME_DIC.FILE_NAME, FILE_NAME_DIC.FORM_START_TIME, " +
-            "FILE_NAME_DIC.FORM_DEADLINE, PERSON_POST.LATTICE_MOUTH_INFORMATION, " +
+            "FILE_NAME_DIC.FORM_DEADLINE, PERSON_POST.FILE_ID, " +
             "FILE_NAME_DIC.ANALYSIS_DATE, FILES.RECORD_NUMBER" +
             ")" +
             "A" +
@@ -130,7 +130,7 @@ public interface LogMapper {
             "and NEW_FILES.NEW_FILE_NAME=#{fileName} " +
             "</if>" +
             "<if test='analysisDate !=\"\"' >" +
-            "AND FILE_NAME_DIC.ANALYSIS_DATE = #{analysisDate} " +
+            "AND FILE_NAME_DIC.ANALYSIS_DATE = to_date(#{analysisDate},'yyyy-MM-dd') " +
             "</if>" +
             "</script>")
     public int selectAnalysisLogCount(@Param("fileName")String fileName, @Param("analysisDate")String analysisDate);