添加更新废证循环单状态

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/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;
     }