修改查询所有身份证详单

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

@@ -207,8 +207,8 @@ public class TaskListApi {
      * @return
      */
     @RequestMapping("queryByCountyAtAuxiliaryState3")
-    public List<Object> queryByCountyAtAuxiliaryState3(@RequestParam("process") String process, HttpServletResponse resp) {
-        List<Object> objects = taskListService.selectByCountyAtAuxiliary3(Long.valueOf(process) - 1);
+    public List<Object> queryByCountyAtAuxiliaryState3(@RequestParam("process") String process,@RequestParam("workGroup")String workGroup, HttpServletResponse resp) {
+        List<Object> objects = taskListService.selectByCountyAtAuxiliary3(Long.valueOf(process) - 1,workGroup);
         return objects;
     }
 

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

@@ -449,11 +449,11 @@ public interface TaskListMapper {
             "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)\n" +
             " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = group_no.GROUP_NO " +
-            "where task.TASK_STATE_ID = #{process}\n" +
+            "where task.TASK_STATE_ID = #{process} and task.work_group=#{workGroup}\n" +
             "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) order by group_no.GROUP_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process,@Param("process2") long process2);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
 
 
     /**
@@ -684,11 +684,11 @@ public interface TaskListMapper {
             " 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 RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
-            "where SPECIAL_CARD.SPECIAL_TYPE =2  and task.TASK_STATE_ID =#{process}\n" +
+            "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),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process,@Param("process2") long process2);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
 
 
     /**
@@ -1015,11 +1015,11 @@ public interface TaskListMapper {
             "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 RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no  " +
-            " where SPECIAL_CARD.SPECIAL_TYPE =1  and task.TASK_STATE_ID =#{process} " +
+            " 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),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process,@Param("process2") long process2);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
 
     /**
      * 任务单查询
@@ -1094,11 +1094,11 @@ public interface TaskListMapper {
             "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 GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
-            "where  FAILED_CARD.STATE =#{process} and FAILED_CARD.STATE!=FAILED_CARD.INITIATOR \n" +
+            "where  FAILED_CARD.STATE =#{process} and FAILED_CARD.work_group=#{workGroup} 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" +
             "order by FAILED_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,@Param("workGroup") long workGroup);
 
 
     /**

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

@@ -39,7 +39,7 @@ public interface TaskListService {
 
     public Map selectByCountyAtAuxiliary2(long process,String workGroup);
 
-    public List<Object> selectByCountyAtAuxiliary3(long process);
+    public List<Object> selectByCountyAtAuxiliary3(long process,String workGroup);
 
     public List<Map<String,Object>> selectGroupAtACCU(String date,String typeCode,String countyCode);
 

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

@@ -372,34 +372,34 @@ public class TaskListServiceImpl implements TaskListService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List selectByCountyAtAuxiliary3(long process) {
+    public List selectByCountyAtAuxiliary3(long process,String workGroup) {
         List<Map<String, Object>> list = new ArrayList<>();
         //电写入
         if (process==4){
-            //查询普通组号列表 在辅助库、制证库中
-            List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
-            //查询快证组号列表 在辅助库、制证库中
-            List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast3(process,process-1);
-            //查询余证组号列表 在辅助库、制证库中
-            List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind3(process,process-1);
-            //查询余证组号列表 在辅助库、制证库中
-            List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
-
-            list = formateMap2(mapList_common);
-            list.addAll(formateMap2(mapList_fast));
-            list.addAll(formateMap2(mapList_remaind));
-            list.addAll(formateMap2(mapList_failed));
+//            //查询普通组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
+//            //查询快证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast3(process,process-1);
+//            //查询余证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind3(process,process-1);
+//            //查询余证组号列表 在辅助库、制证库中
+//            List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
+//
+//            list = formateMap2(mapList_common);
+//            list.addAll(formateMap2(mapList_fast));
+//            list.addAll(formateMap2(mapList_remaind));
+//            list.addAll(formateMap2(mapList_failed));
 
         }else {
             //分拣任务单
             //查询普通组号列表 在辅助库、制证库中
-            List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1);
+            List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-1, Long.valueOf(workGroup));
             //查询快证组号列表 在辅助库、制证库中
-            List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process,process-1);
+            List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process,process-1, Long.valueOf(workGroup));
             //查询余证组号列表 在辅助库、制证库中
-            List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process,process-1);
+            List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process,process-1, Long.valueOf(workGroup));
             //查询余证组号列表 在辅助库、制证库中
-            List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1);
+            List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-1, Long.valueOf(workGroup));
 
             list = formateMap2(mapList_common);
             list.addAll(formateMap2(mapList_fast));