返回工单任务类型

operation_manager/src/main/java/com/huaxu/client/UserCenterClient.java

@@ -3,16 +3,20 @@ package com.huaxu.client;
 import com.huaxu.config.FeignConfig;
 
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 @FeignClient(value = "user-center",configuration={FeignConfig.class})
 public interface UserCenterClient {
 
-
     @PostMapping("/user/getUserIdsByOrgId")
     List<Integer> getUserIdsByOrgId(@RequestParam("ids") String ids);
 
+    @GetMapping("/dict/selectListByPCodes")
+    Map<String,String> selectListByPCodes(@RequestParam String parentDictCodes);
+
 }

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -1,6 +1,6 @@
 package com.huaxu.order.controller;
 
-
+import com.huaxu.client.UserCenterClient;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.ResultStatus;
@@ -47,6 +47,9 @@ public class WorkOrderManageController {
     @Autowired
     WorkFlowService workFlowService;
 
+    @Autowired
+    UserCenterClient userCenterClient;
+
     /**
      * 新增一条数据
      *
@@ -83,7 +86,14 @@ public class WorkOrderManageController {
     @RequestMapping(value = "selectAppTodo", method = RequestMethod.GET)
     @ApiOperation(value = "APP运维管理待处理查询")
     public AjaxMessage<List<WorkOrderManageDto>> selectAppTodo() {
-        return new AjaxMessage<>(ResultStatus.OK,  workOrderManageService.selectAppTodo());
+        List<WorkOrderManageDto> result=workOrderManageService.selectAppTodo();
+        Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
+        if(result.size()>0&&dictMap.size()>0){
+            for(WorkOrderManageDto workOrderManageDto:result) {
+                workOrderManageDto.setTypeName(dictMap.get(workOrderManageDto.getOrderTypeId().toString()));
+            }
+        }
+        return new AjaxMessage<>(ResultStatus.OK,  result);
     }
     /**
      * APP运维管理全部查询
@@ -92,7 +102,14 @@ public class WorkOrderManageController {
     @RequestMapping(value = "selectAppAll", method = RequestMethod.GET)
     @ApiOperation(value = "APP运维管理全部查询")
     public AjaxMessage<List<WorkOrderManageDto>> selectAppAll() {
-        return new AjaxMessage<>(ResultStatus.OK,  workOrderManageService.selectAppAll());
+        List<WorkOrderManageDto> result=workOrderManageService.selectAppAll();
+        Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
+        if(result.size()>0&&dictMap.size()>0){
+            for(WorkOrderManageDto workOrderManageDto:result) {
+                workOrderManageDto.setTypeName(dictMap.get(workOrderManageDto.getOrderTypeId().toString()));
+            }
+        }
+        return new AjaxMessage<>(ResultStatus.OK, result);
     }
     /**
      * 任务和工单的审批、app提交、接单、拒单

user_center/src/main/java/com/huaxu/controller/DictController.java

@@ -17,7 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 数据字典(Dict)控制层
@@ -146,7 +149,7 @@ public class DictController {
      * @param remark 备注
      * @return 数据列表
      */
-    @RequestMapping(value = "selectParentList", method = RequestMethod.POST)
+    @RequestMapping(value = "selectParentList", method = RequestMethod.GET)
     @ApiOperation(value = "根据备注查询字典列表")
     public AjaxMessage<List<DictDto>> selectParentList(
             @ApiParam(value = "备注", required = true)@RequestParam String remark) {
@@ -157,4 +160,22 @@ public class DictController {
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
 
+    /**
+     * 通过父配置id查询数据
+     *
+     * @param
+     * @return 数据列表
+     */
+    @RequestMapping(value = "selectListByPCodes", method = RequestMethod.GET)
+    @ApiOperation(value = "查询父配置字典数据")
+    public Map<String,String> selectListByPCodes(
+            @ApiParam(value = "父字典编码.以逗号隔开", required = true)@RequestParam String parentDictCodes) {
+        Map<String,String> result=new HashMap<>();
+        for(String parentDictCode:parentDictCodes.split(",")){
+            Dict dict=new Dict();
+            dict.setParentDictCode(parentDictCode);
+            result.putAll(dictService.selectList(dict).stream().collect(Collectors.toMap(Dict::getDictCode, Dict::getDictValue)));
+        }
+        return result;
+    }
 }