Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -180,7 +180,11 @@ public class WorkerController {
 
         WorkCycle workCycle = workCycleService.getById(restInfo.getCycleId());
         if (workCycle != null) {
-            BeanUtils.copyProperties(workCycle, restInfo);
+            restInfo.setCarNumber(workCycle.getCarNumber());
+            restInfo.setOrgId(workCycle.getOrgId());
+            restInfo.setOrgName(workCycle.getOrgName());
+            restInfo.setTruckId(workCycle.getTruckId());
+            restInfo.setCycleId(workCycle.getId());
             restInfo.setCycleId(workCycle.getId());
         }
         restInfo.setCreater(userId);
@@ -208,7 +212,10 @@ public class WorkerController {
 
         WorkCycle workCycle = workCycleService.getById(truckRepairInfo.getCycleId());
         if (workCycle != null) {
-            BeanUtils.copyProperties(workCycle, truckRepairInfo);
+            truckRepairInfo.setCarNumber(workCycle.getCarNumber());
+            truckRepairInfo.setOrgId(workCycle.getOrgId());
+            truckRepairInfo.setOrgName(workCycle.getOrgName());
+            truckRepairInfo.setTruckId(workCycle.getTruckId());
             truckRepairInfo.setCycleId(workCycle.getId());
         }
         truckRepairInfo.setCreater(userId);

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"));

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

@@ -265,8 +265,10 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             queryWrapper.ge("complete_date", workOrderPageParam.getCompleteDateFrom());
             queryWrapper.le("complete_date", workOrderPageParam.getCompleteDateTo());
         }
-        if (workOrderParam.getOrderNo() != null) {
-            queryWrapper.eq("order_no", workOrderParam.getOrderNo());
+
+        //根据订单号或者车牌号可以模糊查询，前端传orderNO即可
+        if (StringUtils.isNotBlank(workOrderParam.getOrderNo())) {
+            queryWrapper.and(wrapper -> wrapper.like("car_number", workOrderParam.getOrderNo()).or().like("order_no", workOrderParam.getOrderNo()));
         }
         if (workOrderParam.getOrgId() != null) {
             queryWrapper.eq("org_id", workOrderParam.getOrgId());

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

@@ -198,6 +198,7 @@ public class WorkerServiceImpl implements WorkerService {
     @Override
     @Transactional
     public Boolean submitResult(Long userId, String userName, WorkOrder workOrderParam) {
+        log.info("submitResult workOrderParam:{}", JSON.toJSONString(workOrderParam));
         Boolean flag = true;
         try {
             WorkOrder workOrder = workOrderService.getById(workOrderParam.getId());
@@ -260,6 +261,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrder.setPiWeight(workOrderParam.getPiWeight());
                 workOrder.setMaoWeight(workOrderParam.getMaoWeight());
                 workOrder.setJingWeight(workOrderParam.getJingWeight());
+                workOrder.setActualWeight(workOrderParam.getJingWeight());
                 workOrder.setActualLeaveTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);
 
@@ -340,6 +342,7 @@ public class WorkerServiceImpl implements WorkerService {
             workOrderParam.setPiWeight(workOrderParam.getPiWeight());
             workOrderParam.setMaoWeight(workOrderParam.getMaoWeight());
             workOrderParam.setJingWeight(workOrderParam.getJingWeight());
+            workOrderParam.setActualWeight(workOrderParam.getJingWeight());
             workOrderParam.setEndTrip(workOrderParam.getEndTrip());
             workOrderParam.setEndTripUrl(workOrderParam.getEndTripUrl());
             workOrderService.updateById(workOrderParam);