push

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

@@ -98,7 +98,6 @@ public class TaskListApi {
         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;
         if ("1".equals(process)){
@@ -249,11 +248,10 @@ public class TaskListApi {
      * (辅助库)
      * （分拣）
      *
-     * @param resp
      * @return
      */
     @RequestMapping("queryHistoryTaskAtAuxiliary2")
-    public List<Object> queryHistoryTaskAtAuxiliary2(@RequestParam("date") String date, HttpServletResponse resp) {
+    public List<Object> queryHistoryTaskAtAuxiliary2(@RequestParam("date") String date ) {
         List<Object> objects = taskListService.selectHistoryTaskAtAuxiliary2(replaceDate(date));
         return objects;
     }

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

@@ -123,6 +123,8 @@ public interface FailedCardMapper {
     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);
+    @Update("update FAILED_CARD set FINISH_DATE =sysdate ,state =#{state} where FAILED_CARD_ID = #{failedCardId}")
+    public boolean updateFailedState5(FailedCardEntity failedCardEntity);
 
 
     /**

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

@@ -971,8 +971,8 @@ public interface TaskListMapper {
             "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(FAILED_CARD.POSITION_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed3(@Param("date") String date);
+            "where  to_char(FAILED_CARD.POSITION_DATE,'yyyyMMdd') = #{date} and  FAILED_CARD.work_group =#{workGroup} order by FAILED_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed3(@Param("date") String date,@Param("workGroup") String workGroup);
 
 
     /**
@@ -1007,8 +1007,8 @@ public interface TaskListMapper {
             "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(FAILED_CARD.ALLOT_DATE,'yyyyMMdd') = #{date} order by FAILED_CARD.ACCEPT_NO")
-    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed4(@Param("date") String date);
+            "where  to_char(FAILED_CARD.ALLOT_DATE,'yyyyMMdd') = #{date} and  FAILED_CARD.work_group =#{workGroup} order by FAILED_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed4(@Param("date") String date,@Param("workGroup") String workGroup);
 
 
     /**
@@ -1043,6 +1043,22 @@ public interface TaskListMapper {
             "where  to_char(FAILED_CARD.FINISH_DATE,'yyyyMMdd') = #{date} and  FAILED_CARD.work_group =#{workGroup} order by FAILED_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed5(@Param("date") String date,@Param("workGroup") String workGroup);
 
+    /**
+     * 任务单查询历史
+     *  辅助库 废证
+     * @return
+     */
+    @Select("select 1 FINISH_COUNT, sysdate SORTING_DATE,'' SORTING_NAME, FAILED_CARD.FAILED_CARD_ID 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 ,FAILED_CARD.FINISH_DATE CONCORA_CRUSH_NAME,'' PUNCHING_DATE,'' PUNCHING_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,FAILED_CARD.work_group 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(FAILED_CARD.FINISH_DATE,'yyyyMMdd') = #{date}  order by FAILED_CARD.ACCEPT_NO")
+    public List<Map<String,Object>> selectHistoryTaskAtAuxiliary_failed6(@Param("date") String date);
+
 
     /**
      * 任务单查询历史

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

@@ -104,15 +104,18 @@ public class FailedCardServiceImpl implements FailedCardService {
             case "1":
                 failedCardMapper.updateFailedState1(failedCardEntity);
                 break;
-            case "2":
+//            case "2":
+//                failedCardMapper.updateFailedState2(failedCardEntity);
+//                break;
+//            case "3":
+//                failedCardMapper.updateFailedState3(failedCardEntity);
+//                break;
+            case "4":
                 failedCardMapper.updateFailedState2(failedCardEntity);
                 break;
-            case "3":
+            case "5":
                 failedCardMapper.updateFailedState3(failedCardEntity);
                 break;
-            case "4":
-                failedCardMapper.updateFailedState4(failedCardEntity);
-                break;
         }
         return false;
     }

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

@@ -85,14 +85,10 @@ public class TaskListServiceImpl implements TaskListService {
                     failedCardEntity.setState((long)1);
                     break;
                 case "3":
-                    failedCardEntity.setState((long)2);
                     failedCardEntity.setState((long)4);
                     break;
-                case "4":
-                    failedCardEntity.setState((long)3);
-                    break;
-                case "5":
-                    failedCardEntity.setState((long)4);
+                case "6":
+                    failedCardEntity.setState((long)5);
                     break;
             }
             failedCardService.updateFailedCardState(failedCardEntity);
@@ -513,7 +509,7 @@ public class TaskListServiceImpl implements TaskListService {
                 mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind3(date));
                 //查询历史任务单 废证
 //                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed3(date));
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed5(date,workGroup));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed4(date,workGroup));
                 break;
             case 4:
                 //查询历史任务单 大批证
@@ -523,7 +519,7 @@ public class TaskListServiceImpl implements TaskListService {
                 //查询历史任务单 余证
                 mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind4(date));
                 //查询历史任务单 废证
-                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed4(date));
+                mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed4(date,workGroup));
 
                 break;
             case 5:
@@ -562,6 +558,8 @@ public class TaskListServiceImpl implements TaskListService {
         mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_fast6(date));
         //查询历史任务单 余证
         mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_remaind6(date));
+        //查询历史任务单 废证
+        mapList.addAll(taskListMapper.selectHistoryTaskAtAuxiliary_failed6(date));
         List<Map<String, Object>> mapList1 = formateMap4(mapList);
         return mapList1;
     }

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

@@ -158,8 +158,8 @@
                             <tr>
                                 <td class="mailbox-star"><b>{{task.taskId}}</b></td>
                                 <td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
-                                <td class="mailbox-subject">{{task.policeList.length}}</td>
-                                <td class="mailbox-subject"></td>
+                                <td class="mailbox-subject">{{task.groupList.length}}</td>
+                                <td class="mailbox-subject">{{task.groupNum}}</td>
                                 <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
                                 <td class="mailbox-subject">{{task.specialCount}}</td>
                                 <td class="mailbox-subject">{{task.checkCount}}</td>