修改膜打印 更新工作组数据API

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

@@ -68,7 +68,7 @@ public class ReadExcelApi {
         try {
             //将当前上下文初始化给  CommonsMutipartResolver （多部分解析器）
             CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
-                    requ.getSession().getServletContext());
+                    requ.getServletContext());
             // 判断是否是多数据段提交格式
             if (multipartResolver.isMultipart(requ)) {
                 MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;

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

@@ -66,7 +66,7 @@ public class ReadXmlApi {
         try {
             //将当前上下文初始化给  CommonsMutipartResolver （多部分解析器）
             CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
-                    requ.getSession().getServletContext());
+                    requ.getServletContext());
             // 判断是否是多数据段提交格式
             if (multipartResolver.isMultipart(requ)) {
                 MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) requ;

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

@@ -75,7 +75,7 @@ public class TaskListApi {
      * taskId 任务单ID
      * name 打印转出人姓名
      * process 打印转出人所在工序
-     * printer 打印机编号
+     * failedList 废证任务单
      *
      * @return
      */
@@ -90,7 +90,22 @@ public class TaskListApi {
         List<String> list = (List<String>) jsonArray;
         return taskListService.updateState2(failedList, list, process, name);
     }
-
+    /**
+     * 更改任务单工作组
+     * （打印转出）
+     * taskId 任务单ID
+     * workGroup 工作组
+     *
+     * @return
+     */
+    @RequestMapping("updateWorkGroup")
+    public boolean updateWorkGroup(@RequestBody String json) {
+        JSONObject jsonObject = JSONObject.fromObject(json);
+        JSONArray jsonArray = (JSONArray) jsonObject.get("taskIdList");
+        String workGroup = jsonObject.get("workGroup").toString();
+        List<String> list = (List<String>) jsonArray;
+        return taskListService.updateWorkGroup(list, workGroup);
+    }
 
     /**
      * 查询任务单详情

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

@@ -26,7 +26,7 @@ public interface InfoManagementMapper {
             ") " +
             "A" +
             ")" +
-            "WHERE RN BETWEEN #{end} AND #{begin}" +
+            "WHERE RN BETWEEN #{begin} AND #{end}" +
             "</script>")
     public List<NewFilesEntity> selectInfoManagement(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate, @Param("begin") long begin, @Param("end") long end);
 

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

@@ -1501,6 +1501,8 @@ public interface TaskListMapper {
             "group by CARD_TYPE, CARD_TYPE_ID, failed_count, PUNCHING_DATE")
     public List<Map<String, Object>> selectWorkGroupReport(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup);
 
+    @Update("udpate task set work_group = #{workGroup} where TASK_ID = #{taskId}")
+    public boolean updateWorkGroup(@Param("taskId")String taskId,@Param("workGroup") long workGroup);
 
 
 

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

@@ -100,4 +100,5 @@ public interface TaskListService {
 
     public List<Map<String,Object>> selectWorkGroupReport(String startDate,String endDate,String workGroup);
 
+    public boolean updateWorkGroup(List<String> list,String workGroup);
 }

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

@@ -955,6 +955,15 @@ public class TaskListServiceImpl implements TaskListService {
         return taskListMapper.getPrintOutCount();
     }
 
+    @Override
+    @Transactional
+    public boolean updateWorkGroup(List<String> list, String workGroup) {
+        for (String taskId:list){
+            taskListMapper.updateWorkGroup(taskId,Long.valueOf(workGroup));
+        }
+        return true;
+    }
+
     private String createGroupNo(List<Integer> c, List<Integer> nsList) {
         try {
             String groupNo = "";