巡检查询

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

@@ -544,6 +544,26 @@ public class WorkOrderManageController {
                     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(workOrder.getWorkFlowLogList() != null){
+                        for(WorkFlowLog workFlowLog: workOrder.getWorkFlowLogList()){
+                            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){
                 e.printStackTrace();

operation_manager/src/main/java/com/huaxu/order/dto/WorkOrderManageDto.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.huaxu.model.ProgramItem;
 import com.huaxu.order.entity.WorkFlowDetail;
+import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.order.entity.WorkOrderManage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,18 +18,6 @@ import java.util.List;
 @Data
 public class WorkOrderManageDto extends WorkOrderManage {
 
-    @ApiModelProperty(value = "json格式存储对应任务详情")
-    private String flowDetail;
-
-    @ApiModelProperty(value = "任务工单类型")
-    private String typeName;
-
-    @ApiModelProperty(value = "工作流详情")
-    WorkFlowDetail workFlowDetail;
-
-    @ApiModelProperty(value = "工作流日志集合")
-    List<WorkFlowDetail> workFlowLogList;
-
     /**
      * 所属公司名称
      */
@@ -82,4 +71,16 @@ public class WorkOrderManageDto extends WorkOrderManage {
 
     @ApiModelProperty(value = "修改人名称")
     private String updateByName;
+
+    @ApiModelProperty(value = "json格式存储对应任务详情")
+    private String flowDetail;
+
+    @ApiModelProperty(value = "任务工单类型")
+    private String typeName;
+
+    @ApiModelProperty(value = "工作流详情")
+    WorkFlowDetail workFlowDetail;
+
+    @ApiModelProperty(value = "工作流日志集合")
+    List<WorkFlowLog> workFlowLogList;
 }

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

@@ -7,6 +7,7 @@ import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
 import com.huaxu.model.Pagination;
 import com.huaxu.model.ResultStatus;
+import com.huaxu.order.entity.WorkFlowDetail;
 import com.huaxu.order.entity.WorkFlowLog;
 import com.huaxu.order.service.WorkFlowLogService;
 import com.huaxu.process.entity.ProcessDefinition;
@@ -349,6 +350,25 @@ public class PlanManageController {
                     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(workFlowDetail.getUpdateBy() != null){
+                            workFlowDetail.setUpdateByName(userMap.get(Long.valueOf(workFlowDetail.getUpdateBy())));
+                        }
+                    }
+                    if(plan.getWorkFlowLogList() != null){
+                        for(WorkFlowLog workFlowLog: plan.getWorkFlowLogList()){
+                            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){