push

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

@@ -176,7 +176,7 @@ public class TaskListApi {
     /**
      * 查询任务单详情
      * (辅助库)
-     *（预订位、平压、冲切）
+     *（预订位、平压）
      * @param process 工序
      * @param resp
      * @return
@@ -190,7 +190,7 @@ public class TaskListApi {
     /**
      * 查询任务单详情
      * (辅助库、制证库)
-     *（分拣）
+     *（电写入、分拣）
      * @param process 工序
      * @param resp
      * @return
@@ -202,6 +202,7 @@ public class TaskListApi {
     }
 
 
+
     /**
      * 查询任务单详情（历史）
      * (辅助库)
@@ -216,6 +217,7 @@ public class TaskListApi {
         return objects;
     }
 
+
     /**
      * 查询任务单详情（历史）
      * (辅助库)
@@ -230,10 +232,6 @@ public class TaskListApi {
     }
 
 
-
-
-
-
     /**
      * 生成任务单
      * <p>

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

@@ -295,6 +295,32 @@ public interface TaskListMapper {
             "order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common6(@Param("date")String date );
 
+    /**
+     * 任务单查询历史
+     *  辅助库 大批证
+     *  （电写入）
+     * @param date 查询时间
+     * @return
+     */
+    @Select("select nvl(sum(FINISH_COUNT),0) FINISH_COUNT, SORTING_DATE,SORTING_NAME, 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,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
+            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
+            "CARD_TYPE_DIC.CARD_TYPE  ,\n" +
+            "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
+            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO 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" +
+            " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
+            " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE=GROUP_NO.GROUP_NO " +
+            "where  1= 1 and to_char(PUNCHING_DATE,'yyyyMMdd')= #{date} " +
+            " group by SORTING_DATE, SORTING_NAME, task.task_id, task.COUNTY_CODE, task.SUBMIT_DATE, \n" +
+            "task.SUBMIT_NAME, task.ISSUED_DATE, task.ISSUED_NAME, task.PRINT_OUT_DATE, task.PRINT_OUT_NAME, \n" +
+            "task.POSITION_DATE, task.POSITION_NAME, task.CONCORA_CRUSH_DATE, task.CONCORA_CRUSH_NAME, TASK.PUNCHING_DATE, \n" +
+            "TASK.PUNCHING_NAME, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, \n" +
+            "group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO\n" +
+            "order by group_no.GROUP_NO")
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_common7(@Param("date")String date );
+
 
 
     /**

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

@@ -33,6 +33,7 @@ public interface TaskListService {
 
     public List selectHistoryTaskAtAuxiliary2(String date);
 
+
     public Map selectByCountyAtAuxiliary2(long process);
 
     public List<Object> selectByCountyAtAuxiliary3(long process);

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

@@ -297,6 +297,8 @@ public class TaskListServiceImpl implements TaskListService {
         return list;
     }
 
+
+
     /**
      * 查询历史任务单详情
      * （辅助库）
@@ -389,6 +391,7 @@ public class TaskListServiceImpl implements TaskListService {
         return mapList1;
     }
 
+
     /**
      * 查询组号信息
      * 受理库