修改更改任务单状态

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

@@ -216,15 +216,15 @@ public class TaskListApi {
     /**
      * 查询任务单详情（历史）
      * (辅助库)
-     * （创建、下发、数据核验、预订位、平压、冲切）
+     * （创建、下发、膜打印、预订位、平压、冲切）
      *
      * @param process 工序
      * @param resp
      * @return
      */
     @RequestMapping("queryHistoryTaskAtAuxiliary")
-    public List<Object> queryHistoryTaskAtAuxiliary(@RequestParam("process") String process, @RequestParam("date") String date, HttpServletResponse resp) {
-        List<Object> objects = taskListService.selectHistoryTaskAtAuxiliary(Long.valueOf(process), replaceDate(date));
+    public List<Object> queryHistoryTaskAtAuxiliary(@RequestParam("process") String process, @RequestParam("date") String date,@RequestParam("workGroup") String workGroup, HttpServletResponse resp) {
+        List<Object> objects = taskListService.selectHistoryTaskAtAuxiliary(Long.valueOf(process), replaceDate(date),workGroup);
         return objects;
     }
 

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

@@ -273,7 +273,7 @@ public interface TaskListMapper {
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "CARD_TYPE_DIC.CARD_TYPE  ,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
-            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO,task.work_group 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" +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "where  1= 1 and to_char(SUBMIT_DATE,'yyyyMMdd')= #{date}\n" +
@@ -292,7 +292,7 @@ public interface TaskListMapper {
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "CARD_TYPE_DIC.CARD_TYPE  ,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
-            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO,task.work_group 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" +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "where  1= 1 and to_char(ISSUED_DATE,'yyyyMMdd')= #{date}\n" +
@@ -311,7 +311,7 @@ public interface TaskListMapper {
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "CARD_TYPE_DIC.CARD_TYPE  ,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
-            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO,task.work_group 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" +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "where  1= 1 and to_char(PRINT_OUT_DATE,'yyyyMMdd')= #{date}\n" +
@@ -330,7 +330,7 @@ public interface TaskListMapper {
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "CARD_TYPE_DIC.CARD_TYPE  ,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
-            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO,task.work_group 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" +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "where  1= 1 and to_char(POSITION_DATE,'yyyyMMdd')= #{date}\n" +
@@ -554,7 +554,7 @@ public interface TaskListMapper {
 //            "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             " '快证' CARD_TYPE ,\n" +
-            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "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  " +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -571,7 +571,7 @@ public interface TaskListMapper {
 //            "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             " '快证' CARD_TYPE ,\n" +
-            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "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 " +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -589,7 +589,7 @@ public interface TaskListMapper {
 //            "task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             " '快证' CARD_TYPE ,\n" +
-            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "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 " +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -607,7 +607,7 @@ public interface TaskListMapper {
 //            "task.CONCORA_CRUSH_DATE,\n" +
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             " '快证' CARD_TYPE ,\n" +
-            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "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  " +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -817,7 +817,7 @@ public interface TaskListMapper {
 //            "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "'余证' CARD_TYPE ,\n" +
-            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "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 " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -835,7 +835,7 @@ public interface TaskListMapper {
 //            "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "'余证' CARD_TYPE ,\n" +
-            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "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 " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -853,7 +853,7 @@ public interface TaskListMapper {
 //            "task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "'余证' CARD_TYPE ,\n" +
-            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "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 " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -868,7 +868,7 @@ public interface TaskListMapper {
      */
     @Select("select  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,'废证' 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 from FAILED_CARD \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" +
@@ -886,7 +886,7 @@ public interface TaskListMapper {
 //            "task.CONCORA_CRUSH_DATE,\n" +
 //            "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "'余证' CARD_TYPE ,\n" +
-            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "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 " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -902,7 +902,7 @@ public interface TaskListMapper {
      */
     @Select("select 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,'废证' 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 from FAILED_CARD \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" +
@@ -938,7 +938,7 @@ public interface TaskListMapper {
             "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 ,'' CONCORA_CRUSH_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 from FAILED_CARD \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" +
@@ -971,7 +971,7 @@ public interface TaskListMapper {
             "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 from FAILED_CARD \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" +

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

@@ -33,7 +33,7 @@ public interface TaskListService {
 
     public List<Object> selectByCountyAtAuxiliary(long process);
 
-    public List selectHistoryTaskAtAuxiliary(long process,String date);
+    public List selectHistoryTaskAtAuxiliary(long process,String date,String workGroup);
 
     public List selectHistoryTaskAtAuxiliary2(String date);
 

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

@@ -116,9 +116,17 @@ public class TaskListServiceImpl implements TaskListService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateState2(List<String> failedlist,List<String> list, String process, String name, long printer) {
+       if ("2".equals(process)){
+
+           for (String taskId : list) {
+               taskListMapper.updateState2(taskId, (Long.valueOf(process)+2)+"", name, printer);
+           }
+       }else {
            for (String taskId : list) {
                taskListMapper.updateState2(taskId, process, name, printer);
            }
+       }
+
         for (String failedId :failedlist){
             FailedCardEntity failedCardEntity = new FailedCardEntity();
             failedCardEntity.setFailedCardId(Long.valueOf(failedId));
@@ -413,7 +421,7 @@ public class TaskListServiceImpl implements TaskListService {
      * @return
      */
     @Override
-    public List selectHistoryTaskAtAuxiliary(long process, String date) {
+    public List selectHistoryTaskAtAuxiliary(long process, String date,String workGroup) {
         int pro = (int) process;
         List<Map<String, Object>> mapList = new ArrayList<>();
         switch (pro) {