巡检查询

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

@@ -528,7 +528,8 @@ public class WorkOrderManageController {
                 Long[] ids = idList.toArray(new Long[0]);
                 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) {
+                for(int i = 0; i < result.size(); i++) {
+                    WorkOrderManageDto workOrder = result.get(i);
                     try {
                         if (workOrder.getOrderTypeId() != null) {
                             workOrder.setTypeName(dictMap.get(workOrder.getOrderTypeId().toString()));

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

@@ -334,7 +334,8 @@ public class PlanManageController {
                 Long[] ids = idList.toArray(new Long[0]);
                 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) {
+                for(int i=0; i<planManageDtoList.size();i++){
+                    PlanManageDto plan = planManageDtoList.get(i);
                     try {
                         if (plan.getTaskType() != null) {
                             plan.setTypeName(dictMap.get(plan.getTaskType().toString()));

operation_manager/src/main/java/com/huaxu/task/dto/PlanManageDto.java

@@ -17,6 +17,16 @@ public class PlanManageDto extends PlanManage {
 
     @ApiModelProperty(value = "任务工单类型")
     private String typeName;
+
+    @ApiModelProperty(value = "json格式存储对应任务详情")
+    private String flowDetail;
+
+    @ApiModelProperty(value = "工作流详情")
+    WorkFlowDetail workFlowDetail;
+
+    @ApiModelProperty(value = "工作流日志集合")
+    List<WorkFlowLog> workFlowLogList;
+
     /**
      * 所属公司名称
      */
@@ -63,12 +73,7 @@ public class PlanManageDto extends PlanManage {
     @JsonIgnore
     private String userType;
 
-    @ApiModelProperty(value = "工作流详情")
-    WorkFlowDetail workFlowDetail;
 
-    @ApiModelProperty(value = "工作流日志集合")
-    List<WorkFlowLog> workFlowLogList;
 
-    @ApiModelProperty(value = "json格式存储对应任务详情")
-    private String flowDetail;
+
 }