修改更改任务单状态

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/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) {