解析更改

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

@@ -84,7 +84,6 @@ public class LogApi {
      */
      @RequestMapping("selectAnalysisLogCount")
      public int selectAnalysisLogCount (@RequestParam("fileName")String fileName,@RequestParam("analysisTime")String analysisTime){
-         System.out.println("11111111111111111111111111111"+analysisTime);
          int total = logService.selectAnalysisLogCount(fileName,analysisTime);
          return total;
      }
@@ -110,7 +109,7 @@ public class LogApi {
      @Transactional(rollbackFor = Exception.class)
      public boolean analysis(@RequestParam("printDate")String printDate,@RequestParam("fileId")String fileId){
          logService.changeCardType(printDate,fileId);
-         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+         SimpleDateFormat df = new SimpleDateFormat("yyyyMMddhhmmss");
          logService.insertAnalysisDate(df.format(new Date()),fileId);
          //查询XML文件信息
          List<Map<String,Object>> resultList = logService.selectFileIdByUploadDate(printDate);

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

@@ -34,7 +34,7 @@ public interface LogMapper {
     public boolean changeCardType(@Param("printDate")String printDate,@Param("fileId")String fileId);
 
 
-    @Update(" update FILE_NAME_DIC set  FILE_NAME_DIC.ANALYSIS_DATE = to_date(#{printDate},'yyyy-mm-dd hh24:mi:ss') where  file_id=#{fileId} ")
+    @Update(" update FILE_NAME_DIC set  FILE_NAME_DIC.ANALYSIS_DATE = #{printDate} where  file_id=#{fileId} ")
     public boolean insertAnalysisDate(@Param("printDate")String printDate,@Param("fileId")String fileId);
 
     @Insert("INSERT INTO ANALYSIS (FILE_DIC_ID,FILE_ID,COMMON_CARD_COUNT,POST_CARD_COUNT) VALUES (#{fileDic},#{fileId},#{commonCardCount},#{postCardCount})")
@@ -45,15 +45,16 @@ public interface LogMapper {
             "SELECT * FROM " +
             "( " +
             "SELECT A.*, ROWNUM RN " +
-            "FROM (SELECT FILE_NAME_DIC.FILE_NAME,FILE_NAME_DIC.FORM_START_TIME," +
+            "FROM (SELECT FILES.SOURCE_FILE_NAME,FILE_NAME_DIC.FORM_START_TIME," +
             "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 " +
             "FROM FILE_NAME_DIC " +
             "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 FILE_NAME_DIC.FILE_ID=ANALYSIS.FILE_DIC_ID "+
+            " LEFT JOIN FILES ON ANALYSIS.FILE_ID = FILES.ID " +
+            "left join PREPRO_PERSON on PREPRO_PERSON.FILE_ID = FILES.SOURCE_FILE_NAME " +
             "WHERE  1=1" +
             "<if test='fileName !=\"\"' >" +
             " and FILE_NAME_DIC.FILE_NAME=#{fileName} " +
@@ -61,7 +62,7 @@ public interface LogMapper {
             "<if test='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, " +
+            "group by FILES.SOURCE_FILE_NAME, FILE_NAME_DIC.FORM_START_TIME, " +
             "FILE_NAME_DIC.FORM_DEADLINE, PERSON_POST.FILE_ID, " +
             "FILE_NAME_DIC.ANALYSIS_DATE, FILES.RECORD_NUMBER" +
             ")" +