任务单加上一个工位的操作转出确认时间

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

@@ -43,9 +43,9 @@ public class ExportExcelApi {
         MDC.put("ip", remoteAddr);
         JSONObject jsonObject = JSONObject.fromObject(list);
         JSONArray jsonArray = JSONArray.fromObject(jsonObject.get("list"));
-//        String type = jsonObject.get("type").toString();
+        String isHistory = jsonObject.get("isHistory").toString();
         String name = jsonObject.get("name").toString();
-        List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray, name);
+        List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(jsonArray, name,isHistory);
         response.setContentType("application/x-download");
         response.setCharacterEncoding("UTF-8");
         String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd");

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

@@ -192,12 +192,12 @@ public class TaskListApi {
         String remoteAddr = requ.getRemoteAddr();
         MDC.put("ip", remoteAddr);
         List<Object> objects = new ArrayList <>();
-        try {
+//        try {
             objects = taskListService.selectByCountyAtAuxiliary(Long.valueOf(process) - 1);
-        }catch (Exception e){
-            logger.error("工序：" + process);
-            logger.error("Exception 查询任务单详情(辅助库)（下发、数据核验、膜打印）异常", e);
-        }
+//        }catch (Exception e){
+//            logger.error("工序：" + process);
+//            logger.error("Exception 查询任务单详情(辅助库)（下发、数据核验、膜打印）异常", e);
+//        }
         return objects;
     }
 

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

@@ -234,11 +234,17 @@ public interface TaskListMapper {
      */
     @Select("select distinct task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, nvl(fc.faileCount,0) faileCount\n" +
-            "from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
+            " from group_no left join task on group_no.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" +
             "left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR  and accept_no  not in (select accept_no from special_card )  group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
-            "where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
+            "where task.TASK_STATE_ID = #{process} " +
+            "group by  '000000000', '000000000', task.submit_date, task.task_id, \n" +
+            "CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, \n" +
+            "group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, nvl(fc.faileCount,0), task.work_group, \n" +
+            "decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) \n" +
+            "order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
 
 
@@ -250,6 +256,7 @@ public interface TaskListMapper {
      */
     @Select("select distinct task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, nvl(fc.faileCount,0) faileCount\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
             "from group_no left join task on group_no.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" +
@@ -441,6 +448,7 @@ public interface TaskListMapper {
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
             "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, nvl(fc.faileCount,0) faileCount\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
             "from group_no left join task on group_no.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" +
@@ -458,7 +466,7 @@ public interface TaskListMapper {
 //            "and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) " +
             "group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
-            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by group_no.GROUP_NO")
+            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
 
 
@@ -474,7 +482,7 @@ public interface TaskListMapper {
             "sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count, task.submit_date, task.task_id,\n" +
             "CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, \n" +
             "group_no.VALID_COUNT,group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, \n" +
-            "nvl(fc.faileCount,0) faileCount from group_no \n" +
+            "nvl(fc.faileCount,0) faileCount,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date  from group_no \n" +
             "left join task on group_no.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" +
@@ -495,7 +503,7 @@ public interface TaskListMapper {
 //            "and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) \n" +
             "group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
-            "nvl(fc.faileCount,0), police_dic.police_code, police_dic.police_name, nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0), fc.faileCount \n" +
+            "nvl(fc.faileCount,0), police_dic.police_code, police_dic.police_name, nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0), fc.faileCount,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE)  \n" +
             "order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common5(@Param("process") long process,@Param("process2") long process2);
 
@@ -512,7 +520,8 @@ public interface TaskListMapper {
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
             "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO, nvl(fc.faileCount,0) faileCount\n" +
-            ",task.work_group from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            ",task.work_group,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
+            " from group_no left join task on group_no.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" +
             "left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD  where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR  and accept_no  not in (select accept_no from special_card ) \n" +
@@ -525,7 +534,7 @@ public interface TaskListMapper {
 //            "and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) " +
             "group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
-            "nvl(fc.faileCount,0),'000000000','000000000',nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),task.work_group order by group_no.GROUP_NO")
+            "nvl(fc.faileCount,0),'000000000','000000000',nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),task.work_group,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common3(@Param("process") long process,@Param("process2") long process2);
 
 
@@ -537,7 +546,9 @@ public interface TaskListMapper {
      */
     @Select("select task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
-            ",prod_card_t.id_no,prod_card_t.name from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
+            ",prod_card_t.id_no,prod_card_t.name " +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
+            " from SPECIAL_CARD left join task on SPECIAL_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 " +
             "left join prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
@@ -553,6 +564,7 @@ public interface TaskListMapper {
      */
     @Select("select task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
             "from SPECIAL_CARD left join task on SPECIAL_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 " +
@@ -692,6 +704,7 @@ public interface TaskListMapper {
     @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,police_dic.police_code  ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
             "from SPECIAL_CARD left join task on SPECIAL_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" +
@@ -707,7 +720,7 @@ public interface TaskListMapper {
             "where SPECIAL_CARD.SPECIAL_TYPE =2  and task.work_group=#{workGroup} and task.TASK_STATE_ID =#{process}\n" +
             "group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
-            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name order by SPECIAL_CARD.ACCEPT_NO")
+            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
 
     /**
@@ -719,7 +732,7 @@ public interface TaskListMapper {
     @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name\n" +
-            "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date from SPECIAL_CARD left join task on SPECIAL_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" +
             "left join prod_trace_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
@@ -734,7 +747,7 @@ public interface TaskListMapper {
             "where SPECIAL_CARD.SPECIAL_TYPE =2   and task.TASK_STATE_ID =#{process}\n" +
             "group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
-            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name order by SPECIAL_CARD.ACCEPT_NO")
+            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE)  order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast5(@Param("process") long process,@Param("process2") long process2);
 
 
@@ -776,7 +789,8 @@ public interface TaskListMapper {
             "SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT, \n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name \n" +
-            ",task.work_group from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID \n" +
+            ",task.work_group,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
+            " from SPECIAL_CARD left join task on SPECIAL_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" +
             "left join prod_trace_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO \n" +
@@ -787,7 +801,7 @@ public interface TaskListMapper {
             "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) \n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process} \n" +
             "group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,0 \n" +
-            ",task.work_group,prod_card_t.id_no,prod_card_t.name  order by SPECIAL_CARD.ACCEPT_NO")
+            ",task.work_group,prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE)  order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast4(@Param("process") long process,@Param("process2") long process2);
 
 
@@ -800,6 +814,7 @@ public interface TaskListMapper {
      */
     @Select("select task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
             "from SPECIAL_CARD left join task on SPECIAL_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 " +
@@ -816,7 +831,8 @@ public interface TaskListMapper {
      */
     @Select("select task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name \n" +
-            "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
+            " from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
             "left join prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -833,7 +849,8 @@ public interface TaskListMapper {
      */
     @Select("select DISTINCT task.submit_date, FAILED_CARD.FAILED_CARD_ID task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,task.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO group_No,\n" +
-            "0 faileCount,prod_card_t.id_no,prod_card_t.name from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
+            "0 faileCount,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) last_date " +
+            " from FAILED_CARD 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 prod_card_t@PRODYD_LINK on FAILED_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO " +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -1074,6 +1091,7 @@ public interface TaskListMapper {
     @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
             "from SPECIAL_CARD left join task on SPECIAL_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" +
@@ -1089,7 +1107,7 @@ public interface TaskListMapper {
             " where SPECIAL_CARD.SPECIAL_TYPE =1 and task.work_group=#{workGroup}  and task.TASK_STATE_ID =#{process} " +
             "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
-            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name order by SPECIAL_CARD.ACCEPT_NO")
+            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE)  order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
 
 
@@ -1102,6 +1120,7 @@ public interface TaskListMapper {
     @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,police_dic.police_code ,police_dic.police_name GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,sum(decode(prod_trace_t.CHECK_DATE,null,0,1)) CHECK_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name\n" +
+            ",decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
             "from SPECIAL_CARD left join task on SPECIAL_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" +
@@ -1117,7 +1136,7 @@ public interface TaskListMapper {
             " where SPECIAL_CARD.SPECIAL_TYPE =1  and task.TASK_STATE_ID =#{process} " +
             "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
-            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name order by SPECIAL_CARD.ACCEPT_NO")
+            "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE)  order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind5(@Param("process") long process,@Param("process2") long process2);
 
 //
@@ -1160,7 +1179,8 @@ public interface TaskListMapper {
             "SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT, \n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount,prod_card_t.id_no,prod_card_t.name \n" +
-            ",task.work_group from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID \n" +
+            ",task.work_group,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE) last_date " +
+            " from SPECIAL_CARD left join task on SPECIAL_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" +
             "left join prod_trace_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO \n" +
@@ -1171,7 +1191,7 @@ public interface TaskListMapper {
             "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) \n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID =#{process} \n" +
             "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,0 \n" +
-            ",task.work_group,prod_card_t.id_no,prod_card_t.name  order by SPECIAL_CARD.ACCEPT_NO")
+            ",task.work_group,prod_card_t.id_no,prod_card_t.name,decode(CONNECT_DATE,null,decode(SORTING_DATE,null,decode(PUNCHING_DATE,null,decode(POSITION_DATE,null,decode(PRINT_OUT_DATE,null,task.SUBMIT_DATE,PRINT_OUT_DATE),POSITION_DATE),PUNCHING_DATE),SORTING_DATE),CONNECT_DATE)  order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind4(@Param("process") long process,@Param("process2") long process2);
 
 
@@ -1189,6 +1209,7 @@ public interface TaskListMapper {
             "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "FAILED_CARD.ACCEPT_NO group_No, '0' faileCount,prod_card_t.id_no,prod_card_t.name\n" +
+            ",decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) last_date " +
             "from FAILED_CARD 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" +
@@ -1200,7 +1221,7 @@ public interface TaskListMapper {
             "left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) "+
             "where  FAILED_CARD.STATE =#{process} and FAILED_CARD.work_group=#{workGroup} and FAILED_CARD.STATE!=FAILED_CARD.INITIATOR \n" +
             "group by 0, police_dic.police_code, police_dic.police_name, task.submit_date, FAILED_CARD.failed_card_id, \n" +
-            "'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0,prod_card_t.id_no,prod_card_t.name \n" +
+            "'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) \n" +
             "order by FAILED_CARD.FAILED_CARD_ID")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_failed2(@Param("process") long process,@Param("workGroup") long workGroup);
 
@@ -1216,6 +1237,7 @@ public interface TaskListMapper {
             "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "FAILED_CARD.ACCEPT_NO group_No, 0 faileCount,prod_card_t.id_no,prod_card_t.name\n" +
+            ",decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) last_date " +
             "from FAILED_CARD 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" +
@@ -1227,7 +1249,7 @@ public interface TaskListMapper {
             "left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12)\n" +
             "where  FAILED_CARD.STATE =#{process}  and FAILED_CARD.STATE!=FAILED_CARD.INITIATOR \n" +
             "group by 0, police_dic.police_code, police_dic.police_name, task.submit_date, FAILED_CARD.failed_card_id, \n" +
-            "'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0,prod_card_t.id_no,prod_card_t.name\n" +
+            "'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) \n" +
             "order by FAILED_CARD.FAILED_CARD_ID")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_failed5(@Param("process") long process);
 
@@ -1243,7 +1265,8 @@ public interface TaskListMapper {
             "task.submit_date,FAILED_CARD.failed_card_id task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "FAILED_CARD.ACCEPT_NO group_No, 0 faileCount\n" +
-            ",FAILED_CARD.work_group,prod_card_t.id_no,prod_card_t.name from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
+            ",FAILED_CARD.work_group,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) last_date " +
+            " from FAILED_CARD 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" +
             "left join prod_trace_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO = FAILED_CARD.ACCEPT_NO\n" +
@@ -1252,7 +1275,7 @@ public interface TaskListMapper {
             "where  FAILED_CARD.STATE =#{process} and FAILED_CARD.STATE!=FAILED_CARD.INITIATOR \n" +
             "group by 0, substr(prod_card_t.upload_no,0,9), GAJG_DM.GAJG_MC, task.submit_date, FAILED_CARD.failed_card_id, \n" +
             "'废证', '100', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, FAILED_CARD.ACCEPT_NO, 0\n" +
-            ",FAILED_CARD.work_group,prod_card_t.id_no,prod_card_t.name order by FAILED_CARD.FAILED_CARD_ID")
+            ",FAILED_CARD.work_group,prod_card_t.id_no,prod_card_t.name,decode(ALLOT_DATE,null,decode(FINISH_DATE,null,decode(FAILED_CARD.POSITION_DATE,null,decode(PRINT_DATE,null,FAILED_CARD.SUBMIT_DATE,PRINT_DATE),FAILED_CARD.POSITION_DATE),FINISH_DATE),ALLOT_DATE) order by FAILED_CARD.FAILED_CARD_ID")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_failed3(@Param("process") long process);
 
 

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

@@ -10,7 +10,7 @@ import java.util.Map;
  * 2019/3/9   14:55
  */
 public interface DetailReceiptListService {
-    public List<Map<String,Object>> selectPostDetails(List<Integer> stringList,String name);
+    public List<Map<String,Object>> selectPostDetails(List<Integer> stringList,String name,String isHistory);
 
     public List<DetailReceiptListEntity> selectDetailReceiptListEntityByCardId(String cardID);
 

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

 package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.DetailReceiptListEntity;
-import com.yxproject.start.mapper.DetailReceiptListMapper;
-import com.yxproject.start.service.DetailReceiptListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.yxproject.start.service.DetailReceiptListService;
+import com.yxproject.start.mapper.DetailReceiptListMapper;
 
 import java.util.List;
 import java.util.Map;
@@ -19,7 +19,7 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
     private DetailReceiptListMapper detailReceiptListMapper;
 
     @Override
-    public List<Map<String, Object>> selectPostDetails(List<Integer> stringList,String name) {
+    public List<Map<String, Object>> selectPostDetails(List<Integer> stringList,String name,String isHistory) {
         String str ="";
         for (int i =0;i<stringList.size();i++){
             if (i==stringList.size()-1){
@@ -30,7 +30,9 @@ public class DetailReceiptListServiceImpl implements DetailReceiptListService {
         }
 //        str+=")";
 
+        if ("0".equals(isHistory)){
             detailReceiptListMapper.updateReceiptListEntityByCardId(str,name);
+        }
         return detailReceiptListMapper.selectPostDetails(str);
     }
     @Override

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

@@ -781,7 +781,7 @@ public class TaskListServiceImpl implements TaskListService {
 
         }
         Map<String, Object> datemap = new LinkedHashMap<>();
-        datemap.put("date", "合计");
+        datemap.put("date", "总计");
         datemap.put("yi", yi);
         datemap.put("gangao", gangao);
         datemap.put("kuai", kuai);