fix:导出sql修改

src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -4,10 +4,7 @@ import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -316,7 +313,15 @@ public class BizWorkOrderController extends BaseController {
 //        startPage();
         startOrderBy();
         List<BizWorkOrder> list = bizWorkOrderService.getList2(bizWorkOrder);
+        BizEntrust entrustConditions = new BizEntrust();
+        entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
+        Set<String> bizEntrustSet;
         for(BizWorkOrder v : list){
+//            bizEntrustSet = entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList())
+//            .stream().map(BizEntrust::getToAccountName).distinct().collect(Collectors.toSet());
+            v.setEntrust(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).findFirst().orElse(null));
+            v.setServiceName(v.getEntrust() == null ? v.getServiceName() : v.getEntrust().getToAccountName());
             if(v.getType().equals(2)){
                 v.setTaskTypeName(v.getTaskTypeName()+"-"+v.getTaskTypeDetailName());
             }

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -214,7 +214,7 @@ public class BizWorkOrder extends BaseEntity {
     private Long serviceId;
 
     @TableField(exist = false)
-    @Excel(name = "执行人", sort = 14)
+    @Excel(name = "工单执行人", sort = 14)
     private String serviceName;
 
     @TableField(exist = false)