Merge remote-tracking branch 'origin/dev' into dev

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

@@ -33,11 +33,11 @@ public class ExportExcelApi {
         List<Map<String, Object>> mapList = detailReceiptListService.selectPostDetails(replaceDate(date));
         response.setContentType("application/x-download");
         response.setCharacterEncoding("UTF-8");
-        String dateTime = DateFormatUtils.format(new Date(), "yyyy年MM月dd日");
+        String dateTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
 //        //使用Servlet实现文件下载的时候，避免浏览器自动打开文件
         String fout = null;
         fout = ExportExcel.exportExcelDate(mapList);
-        String outFile = dateTime + "公安网数据";
+        String outFile = dateTime+"公安网信息表" ;
         try {
             FileInputStream fis = new FileInputStream(new File(fout));
             byte[] b = new byte[fis.available()];

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

@@ -97,10 +97,11 @@ public class TaskListApi {
     public boolean updateState(@RequestBody String json) {
         JSONObject jsonObject = JSONObject.fromObject(json);
         JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
+        JSONArray failedList = (JSONArray) jsonObject.get("failedList");
         String process = jsonObject.get("process").toString();
         String name = jsonObject.get("name").toString();
         List<String> list = (List<String>) jsonArray;
-        return taskListService.updateState(list, process, name);
+        return taskListService.updateState(failedList,list, process, name);
     }
 
     /**
@@ -116,11 +117,12 @@ public class TaskListApi {
     public boolean updateState2(@RequestBody String json) {
         JSONObject jsonObject = JSONObject.fromObject(json);
         JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
+        JSONArray failedList = (JSONArray) jsonObject.get("failedList");
         String process = jsonObject.get("process").toString();
         String name = jsonObject.get("name").toString();
         String printer = jsonObject.get("printer").toString();
         List<String> list = (List<String>) jsonArray;
-        return taskListService.updateState2(list, process, name,Long.valueOf(printer));
+        return taskListService.updateState2(failedList,list, process, name,Long.valueOf(printer));
     }
 
 

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

 package com.yxproject.start.mapper;
 
+import com.yxproject.start.entity.FailedCardEntity;
 import org.apache.ibatis.annotations.*;
 import org.omg.CORBA.PUBLIC_MEMBER;
 
@@ -110,5 +111,14 @@ public interface FailedCardMapper {
     @Insert("insert into group_no (GROUP_NO,TASK_ID,VALID_COUNT,INVALID_COUNT)values('12345678','20190308073',79,1);")
     public boolean insertGroupNo(@Param("GROUP_NO")String GROUP_NO,@Param("TASK_ID")String TASK_ID,@Param("VALID_COUNT")long VALID_COUNT,@Param("INVALID_COUNT")long INVALID_COUNT);
 
+    @Update("update FAILED_CARD set PRINT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
+    public boolean updateFailedState1(FailedCardEntity failedCardEntity);
+
+    @Update("update FAILED_CARD set POSITION_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
+    public boolean updateFailedState2(FailedCardEntity failedCardEntity);
+    @Update("update FAILED_CARD set ALLOT_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
+    public boolean updateFailedState3(FailedCardEntity failedCardEntity);
+    @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
+    public boolean updateFailedState4(FailedCardEntity failedCardEntity);
 
 }

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

@@ -152,9 +152,9 @@ public interface TaskListMapper {
             "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 task_id, nvl(count(*),0) faileCount from FAILED_CARD   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where task.TASK_STATE_ID = #{process} order by group_no.GROUP_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_common(@Param("process") long process,@Param("process2") long process2);
 
 
     /**
@@ -339,7 +339,7 @@ public interface TaskListMapper {
             "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 task_id, nvl(count(*),0) faileCount from FAILED_CARD  \n" +
+            "left join (select task_id, nvl(count(*),0) faileCount from FAILED_CARD  where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  \n" +
             "group by task_id ) fc \n" +
             "on fc.TASK_ID = task.TASK_ID\n" +
             "left join prod_trace_t@PROD_LINK on SUBSTR(prod_trace_t.ACCEPT_NO,0,8) = group_no.GROUP_NO\n" +
@@ -350,7 +350,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),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by group_no.GROUP_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process,@Param("process2") long process2);
 
     /**
      * 任务单查询
@@ -363,9 +363,9 @@ public interface TaskListMapper {
             "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 (select task_id,nvl(count(*),0) faileCount from FAILED_CARD   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process,@Param("process2") long process2);
 
     /**
      * 任务单查询历史
@@ -503,7 +503,7 @@ public interface TaskListMapper {
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
             "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD  \n" +
-            "group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  group by task_id ) fc on fc.TASK_ID = task.TASK_ID\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 RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no " +
@@ -511,7 +511,7 @@ public interface TaskListMapper {
             "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 order by SPECIAL_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process,@Param("process2") long process2);
 
     /**
      * 循环单查询
@@ -524,9 +524,9 @@ public interface TaskListMapper {
             "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 (select task_id,nvl(count(*),0) faileCount from FAILED_CARD   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind(@Param("process") long process,@Param("process2") long process2);
 
     /**
      * 循环单查询
@@ -534,13 +534,13 @@ public interface TaskListMapper {
      * @param process 工序
      * @return
      */
-    @Select("select DISTINCT task.submit_date, FAILED_CARD.FAILED_CARD_ID task_id,'废证' CARD_TYPE,'100' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+    @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 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" +
-            "where  FAILED_CARD.STATE = #{process} order by FAILED_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_failed(@Param("process") long process);
+            "where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_failed(@Param("process2") long process2);
 
 
     /**
@@ -731,7 +731,7 @@ public interface TaskListMapper {
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "left join prod_trace_t@PROD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
             "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD  \n" +
-            "group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
+            "where FAILED_CARD.state =#{process2} and FAILED_CARD.state != FAILED_CARD.INITIATOR  group by task_id ) fc on fc.TASK_ID = task.TASK_ID\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 RECEIPT_LIST on RECEIPT_LIST.QR_CODE = special_card.accept_no  " +
@@ -739,7 +739,7 @@ public interface TaskListMapper {
             "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 order by SPECIAL_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process);
+    public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process,@Param("process2") long process2);
 
 
     /**
@@ -759,7 +759,7 @@ 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} \n" +
+            "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" +
             "order by FAILED_CARD.ACCEPT_NO")

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

 package com.yxproject.start.service;
 
+import com.yxproject.start.entity.FailedCardEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -31,4 +32,5 @@ public interface FailedCardService {
 
     public boolean insertGroupNo(@Param("GROUP_NO")String GROUP_NO,@Param("TASK_ID")String TASK_ID,@Param("VALID_COUNT")long VALID_COUNT,@Param("INVALID_COUNT")long INVALID_COUNT);
 
+    public boolean updateFailedCardState(FailedCardEntity failedCardEntity);
 }

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

@@ -20,9 +20,9 @@ public interface TaskListService {
 
     public boolean createTaskList(List<TaskListEntity> resultMap);
 
-    public boolean updateState(List<String> list,String process,String name);
+    public boolean updateState(List<String> failedlist,List<String> list,String process,String name);
 
-    public boolean updateState2(List<String> list,String process,String name,long printer);
+    public boolean updateState2(List<String> failedlist,List<String> list,String process,String name,long printer);
 
     public List<Object> selectByCountyAtACCU(String date);
 

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

 package com.yxproject.start.service.impl;
 
+import com.yxproject.start.entity.FailedCardEntity;
 import com.yxproject.start.entity.TaskEntity;
 import com.yxproject.start.mapper.FailedCardMapper;
 import com.yxproject.start.service.FailedCardService;
@@ -89,5 +90,27 @@ public class FailedCardServiceImpl implements FailedCardService {
         return false;
     }
 
-
+    /**
+     * 更新废证状态
+     * @param failedCardEntity
+     * @return
+     */
+    @Override
+    public boolean updateFailedCardState(FailedCardEntity failedCardEntity) {
+        switch (failedCardEntity.getState()+""){
+            case "1":
+                failedCardMapper.updateFailedState1(failedCardEntity);
+                break;
+            case "2":
+                failedCardMapper.updateFailedState2(failedCardEntity);
+                break;
+            case "3":
+                failedCardMapper.updateFailedState3(failedCardEntity);
+                break;
+            case "4":
+                failedCardMapper.updateFailedState4(failedCardEntity);
+                break;
+        }
+        return false;
+    }
 }

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

 package com.yxproject.start.service.impl;
 
-import com.yxproject.start.entity.CardTypeDicEntity;
-import com.yxproject.start.entity.GroupNoEntity;
-import com.yxproject.start.entity.SpecialCardEntity;
-import com.yxproject.start.entity.TaskEntity;
+import com.yxproject.start.entity.*;
 import com.yxproject.start.entity.TaskList.CountCountyEntity;
 import com.yxproject.start.entity.TaskList.CountGajgEntity;
 import com.yxproject.start.entity.TaskList.TaskListEntity;
 import com.yxproject.start.mapper.GroupNoMapper;
 import com.yxproject.start.mapper.SpecialCardMapper;
 import com.yxproject.start.mapper.TaskListMapper;
+import com.yxproject.start.service.FailedCardService;
 import com.yxproject.start.service.TaskListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,6 +26,8 @@ public class TaskListServiceImpl implements TaskListService {
     private GroupNoMapper groupNoMapper;
     @Autowired
     private SpecialCardMapper specialCardMapper;
+    @Autowired
+    private FailedCardService failedCardService;
 
     @Override
     public List<CountCountyEntity> selectByCounty(String submitDate) {
@@ -56,7 +56,7 @@ public class TaskListServiceImpl implements TaskListService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean updateState(List<String> list, String process, String name) {
+    public boolean updateState(List<String> failedList,List<String> list, String process, String name) {
         for (String taskId : list) {
             switch (process) {
                 case "1":
@@ -82,15 +82,41 @@ public class TaskListServiceImpl implements TaskListService {
             }
 
         }
+        for (String failedId :failedList){
+            FailedCardEntity failedCardEntity = new FailedCardEntity();
+            failedCardEntity.setFailedCardId(Long.valueOf(failedId));
+            switch (process){
+                case "2":
+                    failedCardEntity.setState((long)1);
+                    break;
+                case "3":
+                    failedCardEntity.setState((long)2);
+                    break;
+                case "4":
+                    failedCardEntity.setState((long)3);
+                    break;
+                case "5":
+                    failedCardEntity.setState((long)4);
+                    break;
+            }
+            failedCardService.updateFailedCardState(failedCardEntity);
+        }
+
         return true;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean updateState2(List<String> list, String process, String name, long printer) {
+    public boolean updateState2(List<String> failedlist,List<String> list, String process, String name, long printer) {
         for (String taskId : list) {
             taskListMapper.updateState2(taskId, process, name, printer);
         }
+        for (String failedId :failedlist){
+            FailedCardEntity failedCardEntity = new FailedCardEntity();
+            failedCardEntity.setFailedCardId(Long.valueOf(failedId));
+            failedCardEntity.setState((long)1);
+            failedCardService.updateFailedCardState(failedCardEntity);
+        }
         return true;
     }
 
@@ -229,13 +255,13 @@ public class TaskListServiceImpl implements TaskListService {
     @Transactional(rollbackFor = Exception.class)
     public List<Object> selectByCountyAtAuxiliary(long process) {
         //查询普通组号列表 在辅助库中
-        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common(process);
+        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common(process,process-2);
         //查询快证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process);
+        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process,process-2);
         //查询余证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process);
+        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process,process-2);
         //查询废证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process);
+        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process-2);
         List list = new ArrayList();
         list = formateMap(mapList_common);
         list.addAll(formateMap(mapList_fast));
@@ -256,13 +282,13 @@ public class TaskListServiceImpl implements TaskListService {
     @Transactional(rollbackFor = Exception.class)
     public Map selectByCountyAtAuxiliary2(long process) {
         //查询普通组号列表 在辅助库中
-        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common(process);
+        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common(process,process-2);
         //查询快证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process);
+        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process,process-2);
         //查询余证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process);
+        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process,process-2);
         //查询废证组号列表 在辅助库中
-        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process);
+        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed(process-2);
 
         List<Map<String, Object>> list = new ArrayList<>();
         list = formateMap(mapList_common);
@@ -292,13 +318,13 @@ public class TaskListServiceImpl implements TaskListService {
     @Transactional(rollbackFor = Exception.class)
     public List selectByCountyAtAuxiliary3(long process) {
         //查询普通组号列表 在辅助库、制证库中
-        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process);
+        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common2(process,process-2);
         //查询快证组号列表 在辅助库、制证库中
-        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process);
+        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast2(process,process-2);
         //查询余证组号列表 在辅助库、制证库中
-        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process);
+        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind2(process,process-2);
         //查询余证组号列表 在辅助库、制证库中
-        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process);
+        List<Map<String, Object>> mapList_failed = taskListMapper.selectByCountyAtAuxiliary_failed2(process-2);
         List<Map<String, Object>> list = new ArrayList<>();
         list = formateMap2(mapList_common);
         list.addAll(formateMap2(mapList_fast));

src/main/resources/static/js/service.js

@@ -619,6 +619,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
             },
             addRestCard:function(data,success) {
                 var body = JSON.stringify(data);
+                console.log(body)
                 $http({
                     method: 'POST',
                     url: "../FailedCardApi/insertRemaining",

src/main/resources/static/views/dispatchTask/dispatchTask.js

@@ -160,13 +160,19 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
             var checks = $(".checkOneBox:checked");
             if(checks.length>0){
                 var arr = [];
+                var failedArr = [];
                 for (var i=0;i<checks.length;i++){
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
+                    }else {
                         arr.push(checks[i].value)
                     }
+                }
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updateTaskListProcess(json,function(data){

src/main/resources/static/views/task/task.js

@@ -76,6 +76,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             })
         }
 
+        $rootScope.cardsTotal=0;
+        $scope.restCount=0;
         //TODO 需要保证有废证的任务单不能下发
         //创建变量用来保存选中结果
         $scope.selected = [];
@@ -179,11 +181,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var checks = $("#checkOneBox:checked");
             if(checks.length>0){
                 var arr = [];
+                var failedArr=[];
                 for (var i=0;i<checks.length;i++){
-                    if(!checks[i].disabled){
-                        arr.push(checks[i].value)
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
                     }else{
-                        continue;
+                        arr.push(checks[i].value)
                     }
                 }
 
@@ -191,7 +194,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
                     printer:$("#print").val(),
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updatePrintTaskListProcess(json,function(data){
@@ -333,18 +337,20 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
         $scope.goes = function(){
             var checks = $(".checkOneBox:checked");
             var arr = [];
+            var failedArr=[];
             for (var i=0;i<checks.length;i++){
-                if(!checks[i].disabled){
-                    arr.push(checks[i].value)
+                if(checks[i].value.length<11){
+                    failedArr.push(checks[i].value)
                 }else{
-                    continue;
+                    arr.push(checks[i].value)
                 }
             }
             if(arr.length>0){
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updateTaskListProcess(json,function(data){
@@ -479,17 +485,19 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var checks = $(".checkOneBox:checked");
             if(checks.length>0){
                 var arr = [];
+                var failedArr=[];
                 for (var i=0;i<checks.length;i++){
-                    if(!checks[i].disabled){
-                        arr.push(checks[i].value)
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
                     }else{
-                        continue;
+                        arr.push(checks[i].value);
                     }
                 }
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updateTaskListProcess(json,function(data){
@@ -622,17 +630,19 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             var checks = $(".checkOneBox:checked");
             if(checks.length>0){
                 var arr = [];
+                var failedArr=[];
                 for (var i=0;i<checks.length;i++){
-                    if(!checks[i].disabled){
-                        arr.push(checks[i].value)
+                    if(checks[i].value.length<11){
+                        failedArr.push(checks[i].value)
                     }else{
-                        continue;
+                        arr.push(checks[i].value)
                     }
                 }
                 var json={
                     process:$rootScope.loginData.roleList[0].process,
                     name:$rootScope.loginData.name,
-                    taskIdList:arr
+                    taskIdList:arr,
+                    failedList:failedArr
                 }
                 console.log(json)
                 HttpService.updateTaskListProcess(json,function(data){

src/main/resources/static/views/task/taskListPrint.html

@@ -37,7 +37,7 @@
                 <table class="table table-hover table-striped">
                   <thead>
                     <tr>
-                        <th><input type="checkbox" ng-click="selectAll(type.countyList,type.typeCode,$event)" ng-checked="isSelectedAll($index)"></th>
+                        <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
                         <th>任务单编号</th>
                         <th>核验日期</th>
                         <th>地区</th>
@@ -52,7 +52,7 @@
                   </thead>
                   <tbody ng-repeat="task in type.countyList">
                   <tr>
-                    <td ng-if="task.faileCount==0"><input type="checkbox" id="checkOneBox" class="checkOneBox{{type.typeCode}}" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}"  ng-click="updateSelection($event,task)"></td>
+                    <td ng-if="task.faileCount==0"><input type="checkbox" id="checkOneBox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}"  ng-click="updateSelection($event,task)"></td>
                     <td class="mailbox-star"><b>{{task.taskId}}</b></td>
                     <td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
                     <td class="mailbox-subject"><a>{{task.countyName}}</a></td>