修改

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

@@ -1,5 +1,6 @@
 package com.huaxu.order.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.client.UserCenterClient;
@@ -35,12 +36,16 @@ import io.swagger.annotations.ApiParam;
 import org.activiti.engine.task.Task;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import sun.plugin.com.Utils;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -393,6 +398,21 @@ public class WorkOrderManageController {
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         workOrderManageDto.setPermissonType(loginUser.getPermissonType());
         List<WorkOrderManageDto> list = workOrderManageService.selectMaintainOrder(workOrderManageDto);
+        for(WorkOrderManageDto dto : list){
+            if(dto.getFlowDetail() != null){
+              JSONObject jsonDetail = (JSONObject) JSONObject.parse(dto.getFlowDetail());
+              if(jsonDetail.containsKey("预计完成时间")){
+                  SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                  Date planFinishDate = null;
+                  try {
+                      planFinishDate = dateFormat.parse(jsonDetail.getString("预计完成时间"));
+                  } catch (ParseException e) {
+                      e.printStackTrace();
+                  }
+                  dto.setPlanFinishDate(planFinishDate);
+              }
+            }
+        }
         setName(list);
         return new AjaxMessage<>(ResultStatus.OK, list);
     }

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -792,11 +792,11 @@
   </select>
   <!--维修列表-工单情况（未派单，处理中）-->
   <select id="selectMaintainOrder" resultMap="BaseResultMap" >
-    select t1.id ,t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id,
+    select t1.id ,t1.task_no,  t1.address, t1.task_desc, t1.plan_finish_date, t1.date_create, t1.order_user_id, t2.flow_detail,
     case when t1.order_status=0 then '未派单' when t1.order_status =1 or t1.order_status=4 then '处理中' end order_status_name,
     case when t1.event_type=1 then '运维上报' when t1.event_type=2 then '用户上报' when t1.event_type=3 then '设备告警' end  event_type_name,
     geo
-    from sc_work_order_manage t1
+    from sc_work_order_manage t1 left join sc_work_flow_detail t2 on t1.id=t2.flow_id and t2.flow_type=2
     <where>
       t1.order_status !=2 and t1.order_status !=3
       <if test="order.tenantId != null and order.tenantId != ''">