巡检查询

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

@@ -529,40 +529,48 @@ public class WorkOrderManageController {
                 Map<Long,String> userMap = userCenterClient.findUserIdsByUserIds(ids).stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
                 Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
                 for(WorkOrderManageDto workOrder:result) {
-                    if(workOrder.getOrderTypeId()!=null) {
-                        workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
-                    }
-                    if(workOrder.getSendBy()!=null) {
-                        workOrder.setSendByName(userMap.get(Long.valueOf(workOrder.getSendBy())));
-                    }
-                    if(workOrder.getOrderUserId()!=null) {
-                        workOrder.setOrderUserName(userMap.get(Long.valueOf(workOrder.getOrderUserId())));
-                    }
-                    if(workOrder.getCreateBy()!=null) {
-                        workOrder.setCreateByName(userMap.get(Long.valueOf(workOrder.getCreateBy())));
-                    }
-                    if(workOrder.getUpdateBy()!=null) {
-                        workOrder.setUpdateByName(userMap.get(Long.valueOf(workOrder.getUpdateBy())));
-                    }
-
-                    if(workOrder.getWorkFlowDetail() != null){
-                        WorkFlowDetail workFlowDetail = workOrder.getWorkFlowDetail();
-                        if(workFlowDetail.getCreateBy() != null){
-                            workFlowDetail.setCreateByName(userMap.get(Long.valueOf(workFlowDetail.getCreateBy())));
+                    try {
+                        if (workOrder.getOrderTypeId() != null) {
+                            workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));
                         }
-                        if(workFlowDetail.getUpdateBy() != null){
-                            workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
+                        if (workOrder.getSendBy() != null) {
+                            workOrder.setSendByName(userMap.get(Long.valueOf(workOrder.getSendBy())));
                         }
-                    }
-                    if(workOrder.getWorkFlowLogList() != null){
-                        for(WorkFlowLog workFlowLog: workOrder.getWorkFlowLogList()){
-                            if(workFlowLog.getCreateBy() != null){
-                                workFlowLog.setCreateByName(userMap.get(Long.valueOf(workFlowLog.getCreateBy())));
+                        if (workOrder.getOrderUserId() != null) {
+                            workOrder.setOrderUserName(userMap.get(Long.valueOf(workOrder.getOrderUserId())));
+                        }
+                        if (workOrder.getCreateBy() != null) {
+                            workOrder.setCreateByName(userMap.get(Long.valueOf(workOrder.getCreateBy())));
+                        }
+                        if (workOrder.getUpdateBy() != null) {
+                            workOrder.setUpdateByName(userMap.get(Long.valueOf(workOrder.getUpdateBy())));
+                        }
+
+                        if (workOrder.getWorkFlowDetail() != null) {
+                            WorkFlowDetail workFlowDetail = workOrder.getWorkFlowDetail();
+                            if (workFlowDetail.getCreateBy() != null) {
+                                workFlowDetail.setCreateByName(userMap.get(Long.valueOf(workFlowDetail.getCreateBy())));
+                            }
+                            if (workFlowDetail.getUpdateBy() != null) {
+                                workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
                             }
-                            if(workFlowLog.getUpdateBy() != null){
-                                workFlowLog.setUpdateByName(userMap.get(Long.valueOf(workFlowLog.getUpdateBy())));
+                        }
+                        if (workOrder.getWorkFlowLogList() != null) {
+                            for (WorkFlowLog workFlowLog : workOrder.getWorkFlowLogList()) {
+                                try {
+                                    if (workFlowLog.getCreateBy() != null) {
+                                        workFlowLog.setCreateByName(userMap.get(Long.valueOf(workFlowLog.getCreateBy())));
+                                    }
+                                    if (workFlowLog.getUpdateBy() != null) {
+                                        workFlowLog.setUpdateByName(userMap.get(Long.valueOf(workFlowLog.getUpdateBy())));
+                                    }
+                                }catch (Exception e){
+
+                                }
                             }
                         }
+                    }catch (Exception e){
+
                     }
                 }
             }catch (Exception e){

operation_manager/src/main/java/com/huaxu/order/entity/WorkOrderInfo.java

@@ -11,9 +11,9 @@ import java.util.List;
 @Data
 public class WorkOrderInfo extends WorkOrderManageDto implements Serializable {
 
-    @ApiModelProperty(value = "工作流详情")
-    WorkFlowDetail workFlowDetail;
-
-    @ApiModelProperty(value = "工作流日志集合")
-    List<WorkFlowDetail> workFlowLogList;
+//    @ApiModelProperty(value = "工作流详情")
+//    WorkFlowDetail workFlowDetail;
+//
+//    @ApiModelProperty(value = "工作流日志集合")
+//    List<WorkFlowLog> workFlowLogList;
 }

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

@@ -335,39 +335,47 @@ public class PlanManageController {
                 Map<Long,String> userMap = userCenterClient.findUserIdsByUserIds(ids).stream().collect(Collectors.toMap(UserEntity::getId, UserEntity::getUsername));
                 Map<String,String> dictMap=userCenterClient.selectListByPCodes("SC_WORK_ORDER_TYPE,SC_TASK_TYPE");
                 for (PlanManageDto plan : planManageDtoList) {
-                    if(plan.getTaskType() != null){
-                        plan.setTypeName(dictMap.get(plan.getTaskType().toString()));
-                    }
-                    if(plan.getUserId() != null) {
-                        plan.setUserName(userMap.get(Long.valueOf(plan.getUserId())));
-                    }
-                    if(plan.getPlanUserId() != null){
-                        plan.setPlanUserName(userMap.get(Long.valueOf(plan.getPlanUserId())));
-                    }
-                    if(plan.getCreateBy() != null){
-                        plan.setCreateByName(userMap.get(Long.valueOf(plan.getCreateBy())));
-                    }
-                    if(plan.getUpdateBy() != null){
-                        plan.setUpdateByName(userMap.get(Long.valueOf(plan.getUpdateBy())));
-                    }
-                    if(plan.getWorkFlowDetail() != null){
-                        WorkFlowDetail workFlowDetail = plan.getWorkFlowDetail();
-                        if(workFlowDetail.getCreateBy() != null){
-                            workFlowDetail.setCreateByName(userMap.get(Long.valueOf(workFlowDetail.getCreateBy())));
+                    try {
+                        if (plan.getTaskType() != null) {
+                            plan.setTypeName(dictMap.get(plan.getTaskType().toString()));
                         }
-                        if(workFlowDetail.getUpdateBy() != null){
-                            workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
+                        if (plan.getUserId() != null) {
+                            plan.setUserName(userMap.get(Long.valueOf(plan.getUserId())));
                         }
-                    }
-                    if(plan.getWorkFlowLogList() != null){
-                        for(WorkFlowLog workFlowLog: plan.getWorkFlowLogList()){
-                            if(workFlowLog.getCreateBy() != null){
-                                workFlowLog.setCreateByName(userMap.get(Long.valueOf(workFlowLog.getCreateBy())));
+                        if (plan.getPlanUserId() != null) {
+                            plan.setPlanUserName(userMap.get(Long.valueOf(plan.getPlanUserId())));
+                        }
+                        if (plan.getCreateBy() != null) {
+                            plan.setCreateByName(userMap.get(Long.valueOf(plan.getCreateBy())));
+                        }
+                        if (plan.getUpdateBy() != null) {
+                            plan.setUpdateByName(userMap.get(Long.valueOf(plan.getUpdateBy())));
+                        }
+                        if (plan.getWorkFlowDetail() != null) {
+                            WorkFlowDetail workFlowDetail = plan.getWorkFlowDetail();
+                            if (workFlowDetail.getCreateBy() != null) {
+                                workFlowDetail.setCreateByName(userMap.get(Long.valueOf(workFlowDetail.getCreateBy())));
                             }
-                            if(workFlowLog.getUpdateBy() != null){
-                                workFlowLog.setUpdateByName(userMap.get(Long.valueOf(workFlowLog.getUpdateBy())));
+                            if (workFlowDetail.getUpdateBy() != null) {
+                                workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
                             }
                         }
+                        if (plan.getWorkFlowLogList() != null) {
+                            for (WorkFlowLog workFlowLog : plan.getWorkFlowLogList()) {
+                                try {
+                                    if (workFlowLog.getCreateBy() != null) {
+                                        workFlowLog.setCreateByName(userMap.get(Long.valueOf(workFlowLog.getCreateBy())));
+                                    }
+                                    if (workFlowLog.getUpdateBy() != null) {
+                                        workFlowLog.setUpdateByName(userMap.get(Long.valueOf(workFlowLog.getUpdateBy())));
+                                    }
+                                }catch (Exception e){
+
+                                }
+                            }
+                        }
+                    }catch(Exception e){
+
                     }
                 }
             }

operation_manager/src/main/java/com/huaxu/task/entity/TaskManage.java

@@ -14,9 +14,9 @@ import java.util.List;
 @ApiModel
 public class TaskManage extends PlanManageDto implements Serializable {
 
-    @ApiModelProperty(value = "工作流详情")
-    WorkFlowDetail workFlowDetail;
-
-    @ApiModelProperty(value = "工作流日志集合")
-    List<WorkFlowLog> workFlowLogList;
+//    @ApiModelProperty(value = "工作流详情")
+//    WorkFlowDetail workFlowDetail;
+//
+//    @ApiModelProperty(value = "工作流日志集合")
+//    List<WorkFlowLog> workFlowLogList;
 }