Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit fedf4f05 authored by suichenguang's avatar suichenguang
Browse files
Options

解析更改

parent 21460cb7
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 37 deletions
src/main/java/com/yxproject/start/mapper/LogMapper.java
View file @ fedf4f05
...@@ -41,6 +41,7 @@ public interface LogMapper { ...@@ -41,6 +41,7 @@ public interface LogMapper {
public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount); public boolean insertIntoAnalysis(@Param("fileDic")String fileDic,@Param("fileId")String fileId,@Param("commonCardCount")String commonCardCount,@Param("postCardCount")String postCardCount);
//查询解析数据
@Select("<script> " + @Select("<script> " +
"SELECT * FROM " + "SELECT * FROM " +
"( " + "( " +
...@@ -69,6 +70,7 @@ public interface LogMapper { ...@@ -69,6 +70,7 @@ public interface LogMapper {
@Select("select files.id from files where files.SOURCE_FILE_NAME = #{fileName}") @Select("select files.id from files where files.SOURCE_FILE_NAME = #{fileName}")
public String selectByFileName(@Param("fileName")String fileName); public String selectByFileName(@Param("fileName")String fileName);
/*查询新包日志*/
@Select("<script> " + @Select("<script> " +
"SELECT * FROM " + "SELECT * FROM " +
" ( " + " ( " +
...@@ -121,10 +123,9 @@ public interface LogMapper { ...@@ -121,10 +123,9 @@ public interface LogMapper {
// TODO 解析日志总数 // TODO 解析日志总数
@Select("<script> " + @Select("<script> " +
"SELECT COUNT(*) FROM FILE_NAME_DIC \n" + "SELECT COUNT(*) FROM FILES \n" +
"LEFT JOIN PERSON_POST ON FILE_NAME_DIC.FILE_ID=PERSON_POST.FILE_ID " + "LEFT JOIN ANALYSIS ON ANALYSIS.FILE_ID =FILES.ID "+
"LEFT JOIN ANALYSIS ON ANALYSIS.FILE_DIC_ID = FILE_NAME_DIC.FILE_ID "+ "LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=ANALYSIS.FILE_DIC_ID " +
"LEFT JOIN FILES ON FILES.ID=ANALYSIS.FILE_ID " +
"where 1=1 " + "where 1=1 " +
"<if test='fileName !=\"\"' >" + "<if test='fileName !=\"\"' >" +
"and FILES.SOURCE_FILE_NAME=#{fileName} " + "and FILES.SOURCE_FILE_NAME=#{fileName} " +
......
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @ fedf4f05
...@@ -12,42 +12,59 @@ import java.util.Map; ...@@ -12,42 +12,59 @@ import java.util.Map;
@Mapper @Mapper
public interface SelectSerialNumberMapper { public interface SelectSerialNumberMapper {
@Select("select TASK.TASK_ID," + @Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME," + "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"COUNTY_DIC.COUNTY_CODE," + "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"CARD_TYPE_DIC.CARD_TYPE," + "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID," + "from TASK \n" +
"TASK.ISSUED_DATE," + "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"TASK.PRINT_OUT_DATE," + "LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"TASK.POSITION_DATE," + "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"TASK.CONCORA_CRUSH_DATE, "+ "WHERE TASK.TASK_ID =#{id} and GROUP_NO.GROUP_NO is not null\n" +
"TASK.PUNCHING_DATE," + "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.SORTING_DATE," + "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.QUALITY_TEST_DATE\n" + "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
" from TASK \n" + "UNION all \n" +
" LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" + "select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
" LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" + "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
" WHERE TASK_ID =#{id}") "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n" +
"from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"WHERE TASK.TASK_ID =#{id}\n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE")
public List<Map<String,Object>> selectByWorkOrder(String id); public List<Map<String,Object>> selectByWorkOrder(String id);
@Select("select GROUP_NO.TASK_ID," + @Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"COUNTY_DIC.COUNTYNAME," + "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"COUNTY_DIC.COUNTY_CODE," + "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"CARD_TYPE_DIC.CARD_TYPE," + "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n" +
"CARD_TYPE_DIC.CARD_TYPE_ID," + "from TASK \n" +
"TASK.ISSUED_DATE," + "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"TASK.PRINT_OUT_DATE," + "LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
"TASK.POSITION_DATE," + "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"TASK.CONCORA_CRUSH_DATE, "+ "WHERE GROUP_NO.GROUP_NO =#{id} and GROUP_NO.GROUP_NO is not null\n" +
"TASK.PUNCHING_DATE," + "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.SORTING_DATE," + "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.QUALITY_TEST_DATE\n" + "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
"from TASK\n" + "UNION all \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" + "select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" + "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
"LEFT JOIN GROUP_NO ON TASK.TASK_ID=GROUP_NO.TASK_ID\n" + "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
"WHERE GROUP_NO =#{id}") "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n" +
"from TASK \n" +
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
"WHERE GROUP_NO.GROUP_NO =#{id} \n" +
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE")
public List<Map<String,Object>> selectByGroupNo(String id); public List<Map<String,Object>> selectByGroupNo(String id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment