jxls模板

src/main/java/com/aoyang/tms/service/impl/JxlsExportTestServiceImpl.java

@@ -75,6 +75,12 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
             int listSize = workOrderList.size();
             for (int i = 0; i < listSize; i++) {
                 WorkOrder workOrderParam = workOrderList.get(i);
+                if (workOrderParam.getType() == 2) {
+                    if (workOrderParam.getExecuteTime() != null) {
+                        workOrderParam.setGotoSpotTime(workOrderParam.getExecuteTime());
+                    }
+
+                }
                 workOrderParam.setBetweenTime(DateUtils.betweenTime(workOrderParam.getActualReachTime(), workOrderParam.getActualLeaveTime()));
                 workOrders.add(workOrderParam);
             }

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -11,6 +11,7 @@ import com.aoyang.tms.service.CommonService;
 import com.aoyang.tms.service.TruckEscortService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -146,7 +147,7 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
         if (param.getKeyWord() != null) {
             queryWrapper.like("escort_name", param.getKeyWord()).or().like("mobile", param.getKeyWord());
         }
-        if (param.getEscortName() != null) {
+        if (StringUtils.isNotBlank(param.getEscortName())) {
             queryWrapper.like("escort_name", param.getEscortName());
         }
         List<TruckEscort> list = list(queryWrapper.orderByDesc("update_date"));