修改下发任务单时 添加工作组别

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

@@ -115,6 +115,11 @@ public class FailedCardApi {
             taskEntity.setCardType(cardType);
             taskEntity.setTaskStateId((long) 1);
             taskEntity.setSubmitName(name);
+            if ("null".equals(resultMap.get("WORK_GROUP")+"")){
+
+            }else {
+                taskEntity.setWorkGroup(Long.valueOf(resultMap.get("WORK_GROUP")+""));
+            }
             /*特证数+1*/
             failedCardService.specialCardAdd(acceptNo);
             /*生成新任务单*/

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

@@ -98,9 +98,16 @@ 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;
-        return taskListService.updateState(failedList, list, process, name);
+        if ("1".equals(process)){
+            String workGroup = jsonObject.get("workGroup").toString();
+            return taskListService.updateState1(failedList, list, process, name,workGroup);
+        }else {
+            return taskListService.updateState(failedList, list, process, name);
+        }
+
     }
 
     /**

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

@@ -4,7 +4,6 @@ import com.yxproject.start.entity.FailedCardEntity;
 import com.yxproject.start.entity.FailedCardReasonDicEntity;
 import com.yxproject.start.entity.SpecialCardEntity;
 import org.apache.ibatis.annotations.*;
-import org.omg.CORBA.PUBLIC_MEMBER;
 
 import java.util.List;
 import java.util.Map;
@@ -75,7 +74,7 @@ public interface FailedCardMapper {
 
 
     @Select("select prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE,task.CARD_TYPE\n" +
-            "from prod_card_t@prod_link\n" +
+            " ,task.work_gruop from prod_card_t@prod_link\n" +
             "left join group_no on subStr(prod_card_t.ACCEPT_NO,0,8)=group_no.group_no "+
             "left join task on group_no.task_id = task.task_id "+
             "where  prod_card_t.accept_no=#{acceptNo} or prod_card_t.ID_NO=#{acceptNo}")

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

@@ -160,6 +160,9 @@ public interface TaskListMapper {
             "<if test='connectName != null '>" +
             " ,CONNECT_NAME" +
             "</if>" +
+            "<if test='workGroup != null '>" +
+            " ,work_group" +
+            "</if>" +
             ",TASK_STATE_ID,OLD_CARD_TYPE) " +
             "values(#{cardType},#{countyCode}" +
             "<if test='submitDate != null '>" +
@@ -207,6 +210,9 @@ public interface TaskListMapper {
             "<if test='connectName != null '>" +
             " , #{connectName}" +
             "</if>" +
+            "<if test='workGroup != null '>" +
+            " , #{workGroup}" +
+            "</if>" +
             ",#{taskStateId},#{oldCardType}) </script>")
     @Options(useGeneratedKeys=true, keyProperty="taskId", keyColumn="TASK_ID")
     public boolean saveFastTask(TaskEntity taskEntity);
@@ -1145,8 +1151,8 @@ public interface TaskListMapper {
      * @param taskId
      * @return
      */
-    @Update("UPDATE TASK SET TASK_STATE_ID=#{process},ISSUED_NAME=#{name} WHERE TASK_ID = #{taskId} ")
-    public boolean updateState1(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name);
+    @Update("UPDATE TASK SET TASK_STATE_ID=#{process},ISSUED_NAME=#{name} work_group = #{workGroup},WHERE TASK_ID = #{taskId} ")
+    public boolean updateState1(@Param("taskId") String taskId,@Param("process") String process,@Param("name") String name,@Param("workGroup") String workGroup);
 
     /**
      *更改任务单状态

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

@@ -12,23 +12,23 @@ public interface FailedCardService {
 
     public List<FailedCardReasonDicEntity>selectFailedCardDic();
 
-    public Map<String,Object> selectInfoByCardId(@Param("cardId")String cardId);
+    public Map<String,Object> selectInfoByCardId(String cardId);
 
-    public boolean insertFailedCard(@Param("failedCardReasonId")String failedCardReasonId,@Param("acceptNo")String acceptNo,@Param("taskId")String taskId,@Param("initiator")String initiator,@Param("note")String note,String workGroup);
+    public boolean insertFailedCard(String failedCardReasonId,String acceptNo,String taskId,String initiator,String note,String workGroup);
 
     public Map<String,Object> selectCountIdByCardId(String cardId);
 
-    public boolean specialCardAdd(@Param("acceptNo") String acceptNo);
+    public boolean specialCardAdd(String acceptNo);
 
     public boolean addSpecialCard(SpecialCardEntity specialCardEntity);
 
-    public Map<String, Object> selectTaskListDate(@Param("acceptNo")String acceptNo);
+    public Map<String, Object> selectTaskListDate(String acceptNo);
 
     public List<String> selectCardType();
 
     public List<String>selectGroupNo(String idCard);
 
-    public Map<String,Object> selectTaskListById(@Param("id") String id);
+    public Map<String,Object> selectTaskListById(String id);
 
     public Map<String,Object> selectGroupDate(String groupNo);
 

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

@@ -23,6 +23,8 @@ public interface TaskListService {
 
     public boolean updateState(List<String> failedlist,List<String> list,String process,String name);
 
+    public boolean updateState1(List<String> failedlist,List<String> list,String process,String name,String workGroup);
+
     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/TaskListServiceImpl.java

@@ -56,9 +56,6 @@ public class TaskListServiceImpl implements TaskListService {
     public boolean updateState(List<String> failedList,List<String> list, String process, String name) {
         for (String taskId : list) {
             switch (process) {
-                case "1":
-                    taskListMapper.updateState1(taskId, process, name);
-                    break;
                 case "3":
                     taskListMapper.updateState3(taskId, process, name);
                     break;
@@ -102,6 +99,20 @@ public class TaskListServiceImpl implements TaskListService {
         return true;
     }
 
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateState1(List<String> failedList,List<String> list, String process, String name,String workGroup) {
+        for (String taskId : list) {
+                    taskListMapper.updateState1(taskId, process, name,workGroup);
+
+        }
+        return true;
+    }
+
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateState2(List<String> failedlist,List<String> list, String process, String name, long printer) {