修改查询任务单详情

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

@@ -163,7 +163,7 @@ public class TaskListApi {
     /**
      * 查询任务单详情
      * (辅助库)
-     *
+     *（下发、数据核验）
      * @param process 工序
      * @param resp
      * @return
@@ -177,15 +177,15 @@ public class TaskListApi {
     /**
      * 查询任务单详情
      * (辅助库)
-     *
+     *（预订位、平压、冲切）
      * @param process 工序
      * @param resp
      * @return
      */
     @RequestMapping("queryByCountyAtAuxiliaryState1")
-    public List<Object> queryByCountyAtAuxiliaryState1(@RequestParam("process") String process, HttpServletResponse resp) {
-        List<Object> objects = taskListService.selectByCountyAtAuxiliary(Long.valueOf(process) - 1);
-        return objects;
+    public Map queryByCountyAtAuxiliaryState1(@RequestParam("process") String process, HttpServletResponse resp) {
+        Map map = taskListService.selectByCountyAtAuxiliary2(Long.valueOf(process) - 1);
+        return map;
     }
 
     /**

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

@@ -29,6 +29,8 @@ public interface TaskListService {
 
     public List<Object> selectByCountyAtAuxiliary(long process);
 
+    public Map selectByCountyAtAuxiliary2(long process);
+
     public List<Object> selectGroupAtACCU(String date,String typeCode,String countyCode);
 
     public List<Object> selectGroupAtACCU(String groupNo);

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

@@ -217,6 +217,7 @@ public class TaskListServiceImpl implements TaskListService {
     /**
      * 查询任务单详情
      * 辅助库
+     * (下发、数据核验)
      * @param process 查询工序
      * @return
      */
@@ -236,6 +237,37 @@ public class TaskListServiceImpl implements TaskListService {
         return list;
     }
 
+    /**
+     * 查询任务单详情
+     * 辅助库
+     * (预订位、平压、冲切)
+     * @param process 查询工序
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map selectByCountyAtAuxiliary2(long process) {
+        //查询普通组号列表 在辅助库中
+        List<Map<String, Object>> mapList_common = taskListMapper.selectByCountyAtAuxiliary_common(process);
+        //查询快证组号列表 在辅助库中
+        List<Map<String, Object>> mapList_fast = taskListMapper.selectByCountyAtAuxiliary_fast(process);
+        //查询余证组号列表 在辅助库中
+        List<Map<String, Object>> mapList_remaind = taskListMapper.selectByCountyAtAuxiliary_remaind(process);
+        List<Map<String,Object>> list = new ArrayList<>();
+        list = formateMap(mapList_common);
+        list.addAll(formateMap(mapList_fast));
+        list.addAll(formateMap(mapList_remaind));
+        int total =0;
+        for (Map<String,Object> map : list){
+            total+=Integer.valueOf(map.get("typeSum").toString());
+        }
+        Map<String,Object> map = new LinkedHashMap<>();
+        map.put("total",total);
+        map.put("typeList",list);
+
+        return map;
+    }
+
     /**
      * 查询组号信息
      * 受理库
@@ -412,7 +444,7 @@ public class TaskListServiceImpl implements TaskListService {
     }
 
 
-    private List formateMap(List<Map<String, Object>> maplist){
+    private List<Map<String,Object>> formateMap(List<Map<String, Object>> maplist){
         Map<String,Object> typeMap = new LinkedHashMap<>();
         for (Map  o :maplist){
             // 组合JSON