巡检查询

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

@@ -21,6 +21,8 @@ import com.huaxu.process.entity.ProcessDefinition;
 import com.huaxu.process.service.WorkFlowService;
 import com.huaxu.process.utils.Action;
 import com.huaxu.task.entity.PlanManage;
+import com.huaxu.task.entity.TaskManage;
+import com.huaxu.task.entity.UserEntity;
 import com.huaxu.task.service.PlanManageService;
 import com.huaxu.util.DatesUtil;
 import com.huaxu.util.UserUtil;

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -125,7 +125,7 @@ public class PlanManageController {
         IPage<TaskManage> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
         Pagination<TaskManage> pages = new Pagination<>(iPage);
-        //setUserName(pages);
+        setUserName(pages);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
@@ -153,7 +153,7 @@ public class PlanManageController {
         IPage<TaskManage> iPage = new Page<>(pageNum, pageSize);
         iPage = planManageService.selectPage(iPage, planManageDto);
         Pagination<TaskManage> pages = new Pagination<>(iPage);
-        //setUserName(pages);
+        setUserName(pages);
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
 
@@ -305,7 +305,7 @@ public class PlanManageController {
      * 获取并设置用户名称
      * @param pages
      */
-    private void setUserName(Pagination<PlanManageDto> pages){
+    private void setUserName(Pagination<TaskManage> pages){
         if(pages.getTotal()>0) {
             int total = (int) pages.getTotal();
             List<Long> idList = new ArrayList<Long>();
@@ -327,30 +327,30 @@ public class PlanManageController {
             for( int i =0 ;i<idList.size(); i++){
                 ids[i] = idList.get(i);
             }
-            List<UserEntity> userMap = userCenterClient.findUserIdsByUserIds(ids);
+            List<UserEntity> userList = userCenterClient.findUserIdsByUserIds(ids);
             for (PlanManage plan : pages.getList()) {
-               /* for (Map.Entry<Long, String> entry : userMap.entrySet()) {
+                for(UserEntity userEntity : userList){
                     if(plan.getUserId() != null) {
-                        if(entry.getKey()== Long.parseLong(plan.getUserId())){
-                            plan.setUserName(entry.getValue());
+                        if(userEntity.getId()== Long.parseLong(plan.getUserId())){
+                            plan.setUserName(userEntity.getUsername());
                         }
                     }
                     if(plan.getPlanUserId() != null){
-                        if(entry.getKey()== Long.parseLong(plan.getPlanUserId())){
-                            plan.setPlanUserName(entry.getValue());
+                        if(userEntity.getId()== Long.parseLong(plan.getPlanUserId())){
+                            plan.setPlanUserName(userEntity.getUsername());
                         }
                     }
                     if(plan.getCreateBy() != null){
-                        if(entry.getKey()== Long.parseLong(plan.getCreateBy())){
-                            plan.setCreateByName(entry.getValue());
+                        if(userEntity.getId()== Long.parseLong(plan.getCreateBy())){
+                            plan.setCreateByName(userEntity.getUsername());
                         }
                     }
                     if(plan.getUpdateBy() != null) {
-                        if(entry.getKey()== Long.parseLong(plan.getUpdateBy())){
-                            plan.setUpdateByName(entry.getValue());
+                        if(userEntity.getId()== Long.parseLong(plan.getUpdateBy())){
+                            plan.setUpdateByName(userEntity.getUsername());
                         }
-                    }*/
-               // }
+                    }
+                }
             }
         }
     }