Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 5b67fbe2 authored by dahai's avatar dahai
Browse files
Options

添加废证循环单查询历史详情 

添加废证循环单查询详情
parent b73525dd
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 37 deletions
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 5b67fbe2
...@@ -600,20 +600,16 @@ public interface TaskListMapper { ...@@ -600,20 +600,16 @@ public interface TaskListMapper {
/** /**
* 任务单查询历史 * 任务单查询历史
* 辅助库 余证 * 辅助库 废证
* @return * @return
*/ */
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" + @Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"task.PRINT_OUT_DATE,task.PRINT_OUT_NAME," + "FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
// "task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" + "1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO GROUP_NO from FAILED_CARD \n" +
// "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," + "left join task on FAILED_CARD.task_id= task.TASK_ID \n" +
"'余证' CARD_TYPE ,\n" + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" + "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"left join task on special_card.task_id= task.TASK_ID \n" + "where to_char(PRINT_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.ACCEPT_NO")
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
" left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where SPECIAL_CARD.SPECIAL_TYPE =1 " +
" and PRINT_OUT_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed2(@Param("date") String date); public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed2(@Param("date") String date);
...@@ -635,6 +631,22 @@ public interface TaskListMapper { ...@@ -635,6 +631,22 @@ public interface TaskListMapper {
" and POSITION_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO") " and POSITION_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind3(@Param("date") String date); public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind3(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 废证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,FAILED_CARD.POSITION_DATE POSITION_DATE,'' POSITION_NAME,'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
"1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO GROUP_NO from FAILED_CARD \n" +
"left join task on FAILED_CARD.task_id= task.TASK_ID \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(POSITION_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed3(@Param("date") String date);
/** /**
* 任务单查询历史 * 任务单查询历史
* 辅助库 余证 * 辅助库 余证
...@@ -653,6 +665,24 @@ public interface TaskListMapper { ...@@ -653,6 +665,24 @@ public interface TaskListMapper {
" and CONCORA_CRUSH_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO") " and CONCORA_CRUSH_DATE =#{date} order by SPECIAL_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind4(@Param("date") String date); public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_remaind4(@Param("date") String date);
/**
* 任务单查询历史
* 辅助库 废证
* @return
*/
@Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
"FAILED_CARD.PRINT_DATE PRINT_OUT_DATE,'' PRINT_OUT_NAME,FAILED_CARD.POSITION_DATE POSITION_DATE,'' POSITION_NAME," +
" FAILED_CARD.ALLOT_DATE CONCORA_CRUSH_DATE ,'' CONCORA_CRUSH_NAME " +
"'废证' CARD_TYPE ,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, \n" +
"1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO GROUP_NO from FAILED_CARD \n" +
"left join task on FAILED_CARD.task_id= task.TASK_ID \n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
"left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
"where to_char(ALLOT_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.ACCEPT_NO")
public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed4(@Param("date") String date);
/** /**
* 任务单查询历史 * 任务单查询历史
* 辅助库 余证 * 辅助库 余证
...@@ -712,29 +742,28 @@ public interface TaskListMapper { ...@@ -712,29 +742,28 @@ public interface TaskListMapper {
public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process); public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process);
// /** /**
// * 任务单查询 * 任务单查询
// * 辅助库、制证库 余证 * 辅助库、制证库 余证
// * @param process 工序 * @param process 工序
// * @return * @return
// */ */
// @Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" + @Select("select DISTINCT 0 finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,\n" +
// "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" + "substr(prod_card_t.upload_no,0,9) police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" +
// "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" + "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
// "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" + "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
// "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" + "FAILED_CARD.ACCEPT_NO group_No, 0 faileCount\n" +
// "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" + "from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
// "left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" + "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
// "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" + "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
// "group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" + "left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = FAILED_CARD.ACCEPT_NO\n" +
// "left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" + "left join prod_card_t@PROD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
// "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)" + "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
// " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " + "where FAILED_CARD.STATE =#{process} \n" +
// " where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process} " + "group by 0, substr(prod_card_t.upload_no,0,9), GAJG_DM.GAJG_MC, task.submit_date, FAILED_CARD.failed_card_id, \n" +
// "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" + "'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0\n" +
// "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" + "order by FAILED_CARD.ACCEPT_NO")
// "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by SPECIAL_CARD.ACCEPT_NO") public List<Map<String,Object>> selectByCountyAtAuxiliary_failed2(@Param("process") long process);
// public List<Map<String,Object>> selectByCountyAtAuxiliary_failed2(@Param("process") long process);
......
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ 5b67fbe2
...@@ -34,7 +34,6 @@ public interface TaskListService { ...@@ -34,7 +34,6 @@ public interface TaskListService {
public List selectHistoryTaskAtAuxiliary2(String date); public List selectHistoryTaskAtAuxiliary2(String date);
public Map selectByCountyAtAuxiliary2(long process); public Map selectByCountyAtAuxiliary2(long process);
public List<Object> selectByCountyAtAuxiliary3(long process); public List<Object> selectByCountyAtAuxiliary3(long process);
......
src/main/java/com/yxproject/start/service/impl/TaskListServiceImpl.java
View file @ 5b67fbe2
...@@ -298,12 +298,12 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -298,12 +298,12 @@ public class TaskListServiceImpl implements TaskListService {
//查询余证组号列表 在辅助库、制证库中 //查询余证组号列表 在辅助库、制证库中
List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process); List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process);
//查询余证组号列表 在辅助库、制证库中 //查询余证组号列表 在辅助库、制证库中
// List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process); List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process);
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
list = formateMap2(mapList_common); list = formateMap2(mapList_common);
list.addAll(formateMap2(mapList_fast)); list.addAll(formateMap2(mapList_fast));
list.addAll(formateMap2(mapList_remaind)); list.addAll(formateMap2(mapList_remaind));
// list.addAll(formateMap2(mapList_failed)); list.addAll(formateMap2(mapList_failed));
return list; return list;
} }
...@@ -347,6 +347,8 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -347,6 +347,8 @@ public class TaskListServiceImpl implements TaskListService {
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast2(date)); mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast2(date));
//查询历史任务单 余证 //查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind2(date)); mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind2(date));
//查询历史任务单 废证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed2(date));
break; break;
case 3: case 3:
//查询历史任务单 大批证 //查询历史任务单 大批证
...@@ -355,6 +357,8 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -355,6 +357,8 @@ public class TaskListServiceImpl implements TaskListService {
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast3(date)); mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast3(date));
//查询历史任务单 余证 //查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind3(date)); mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind3(date));
//查询历史任务单 废证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed3(date));
break; break;
case 4: case 4:
//查询历史任务单 大批证 //查询历史任务单 大批证
...@@ -363,6 +367,9 @@ public class TaskListServiceImpl implements TaskListService { ...@@ -363,6 +367,9 @@ public class TaskListServiceImpl implements TaskListService {
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast4(date)); mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast4(date));
//查询历史任务单 余证 //查询历史任务单 余证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind4(date)); mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind4(date));
//查询历史任务单 废证
mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed4(date));
break; break;
case 5: case 5:
//查询历史任务单 大批证 //查询历史任务单 大批证
......
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