From b46065a201c09ce69f111806f2bda4a5f476bc4e Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 18 十月 2025 17:20:22 +0800
Subject: [PATCH] fix:用户同步,机构同步

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java |  342 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 330 insertions(+), 12 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
index 093a6a4..baaece3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskServiceImpl.java
@@ -1,10 +1,13 @@
 package com.ruoyi.system.service.impl;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
 import java.io.File;
 import java.io.IOException;
+
+import com.ruoyi.system.utils.TaskCodeGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -12,12 +15,15 @@
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.GpsDistanceUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.system.domain.SysTask;
 import com.ruoyi.system.domain.SysTaskVehicle;
 import com.ruoyi.system.domain.SysTaskAttachment;
 import com.ruoyi.system.domain.SysTaskLog;
+import com.ruoyi.system.domain.SysTaskEmergency;
+import com.ruoyi.system.domain.SysTaskWelfare;
 import com.ruoyi.system.domain.vo.TaskQueryVO;
 import com.ruoyi.system.domain.vo.TaskCreateVO;
 import com.ruoyi.system.domain.vo.TaskUpdateVO;
@@ -27,6 +33,10 @@
 import com.ruoyi.system.mapper.SysTaskVehicleMapper;
 import com.ruoyi.system.mapper.SysTaskAttachmentMapper;
 import com.ruoyi.system.mapper.SysTaskLogMapper;
+import com.ruoyi.system.mapper.SysTaskEmergencyMapper;
+import com.ruoyi.system.mapper.SysTaskWelfareMapper;
+import com.ruoyi.system.mapper.VehicleInfoMapper;
+import com.ruoyi.system.domain.VehicleInfo;
 import com.ruoyi.system.service.ISysTaskService;
 
 /**
@@ -49,6 +59,15 @@
     
     @Autowired
     private SysTaskLogMapper sysTaskLogMapper;
+    
+    @Autowired
+    private SysTaskEmergencyMapper sysTaskEmergencyMapper;
+    
+    @Autowired
+    private SysTaskWelfareMapper sysTaskWelfareMapper;
+    
+    @Autowired
+    private VehicleInfoMapper vehicleInfoMapper;
 
     /**
      * 鏌ヨ浠诲姟绠$悊
@@ -58,7 +77,20 @@
      */
     @Override
     public SysTask selectSysTaskByTaskId(Long taskId) {
-        return sysTaskMapper.selectSysTaskByTaskId(taskId);
+        SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
+        if (task != null) {
+            // 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
+            if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+                SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+                task.setEmergencyInfo(emergencyInfo);
+            }
+            // 鍔犺浇绂忕杞︽墿灞曚俊鎭�
+            else if ("WELFARE".equals(task.getTaskType())) {
+                SysTaskWelfare welfareInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+                task.setWelfareInfo(welfareInfo);
+            }
+        }
+        return task;
     }
 
     /**
@@ -86,8 +118,6 @@
         task.setTaskType(createVO.getTaskType());
         task.setTaskStatus(TaskStatus.PENDING.getCode());
         task.setTaskDescription(createVO.getTaskDescription());
-        task.setDepartureAddress(createVO.getDepartureAddress());
-        task.setDestinationAddress(createVO.getDestinationAddress());
         task.setPlannedStartTime(createVO.getPlannedStartTime());
         task.setPlannedEndTime(createVO.getPlannedEndTime());
         task.setAssigneeId(createVO.getAssigneeId());
@@ -95,10 +125,86 @@
         task.setDeptId(SecurityUtils.getDeptId());
         task.setCreateBy(SecurityUtils.getUsername());
         task.setCreateTime(DateUtils.getNowDate());
+        task.setUpdateBy(SecurityUtils.getUsername());
+        task.setUpdateTime(DateUtils.getNowDate());
         task.setRemark(createVO.getRemark());
         task.setDelFlag("0");
         
+        // 璁剧疆閫氱敤鍦板潃鍜屽潗鏍囦俊鎭�
+        if (createVO.getDepartureAddress() != null) {
+            task.setDepartureAddress(createVO.getDepartureAddress());
+        }
+        if (createVO.getDestinationAddress() != null) {
+            task.setDestinationAddress(createVO.getDestinationAddress());
+        }
+        if (createVO.getDepartureLongitude() != null) {
+            task.setDepartureLongitude(createVO.getDepartureLongitude());
+        }
+        if (createVO.getDepartureLatitude() != null) {
+            task.setDepartureLatitude(createVO.getDepartureLatitude());
+        }
+        if (createVO.getDestinationLongitude() != null) {
+            task.setDestinationLongitude(createVO.getDestinationLongitude());
+        }
+        if (createVO.getDestinationLatitude() != null) {
+            task.setDestinationLatitude(createVO.getDestinationLatitude());
+        }
+        if (createVO.getEstimatedDistance() != null) {
+            task.setEstimatedDistance(createVO.getEstimatedDistance());
+        }
+        
+        // 璁剧疆鎬ユ晳杞繍鐗瑰畾淇℃伅
+        if (createVO.getTransferTime() != null) {
+            task.setPlannedStartTime(createVO.getTransferTime());
+        }
+        if (createVO.getTransferDistance() != null) {
+            task.setEstimatedDistance(createVO.getTransferDistance());
+        }
+        
+        // 璁剧疆绂忕杞︾壒瀹氫俊鎭�
+        if (createVO.getServiceTime() != null) {
+            task.setPlannedStartTime(createVO.getServiceTime());
+        }
+        if (createVO.getStartAddress() != null) {
+            task.setDepartureAddress(createVO.getStartAddress());
+        }
+        if (createVO.getEndAddress() != null) {
+            task.setDestinationAddress(createVO.getEndAddress());
+        }
+        // 璁剧疆绂忕杞﹀叕閲屾暟
+        if (createVO.getDistance() != null) {
+            task.setEstimatedDistance(createVO.getDistance());
+        }
+        
         int result = sysTaskMapper.insertSysTask(task);
+        
+        // 淇濆瓨杞﹁締鍏宠仈淇℃伅
+        if (result > 0 && createVO.getVehicleIds() != null && !createVO.getVehicleIds().isEmpty()) {
+            for (Long vehicleId : createVO.getVehicleIds()) {
+                SysTaskVehicle taskVehicle = new SysTaskVehicle();
+                taskVehicle.setTaskId(task.getTaskId());
+                taskVehicle.setVehicleId(vehicleId);
+                taskVehicle.setAssignTime(DateUtils.getNowDate());
+                taskVehicle.setAssignBy(SecurityUtils.getUsername());
+                taskVehicle.setStatus("ASSIGNED");
+                taskVehicle.setCreateBy(SecurityUtils.getUsername());
+                taskVehicle.setCreateTime(DateUtils.getNowDate());
+                taskVehicle.setUpdateBy(SecurityUtils.getUsername());
+                taskVehicle.setUpdateTime(DateUtils.getNowDate());
+                
+                sysTaskVehicleMapper.insertSysTaskVehicle(taskVehicle);
+            }
+        }
+        
+        // 淇濆瓨鎬ユ晳杞繍鎵╁睍淇℃伅
+        if (result > 0 && "EMERGENCY_TRANSFER".equals(createVO.getTaskType())) {
+            saveEmergencyInfo(task.getTaskId(), createVO);
+        }
+        
+        // 淇濆瓨绂忕杞︽墿灞曚俊鎭�
+        if (result > 0 && "WELFARE".equals(createVO.getTaskType())) {
+            saveWelfareInfo(task.getTaskId(), createVO);
+        }
         
         // 璁板綍鎿嶄綔鏃ュ織
         if (result > 0) {
@@ -128,12 +234,19 @@
         task.setTaskDescription(updateVO.getTaskDescription());
         task.setDepartureAddress(updateVO.getDepartureAddress());
         task.setDestinationAddress(updateVO.getDestinationAddress());
+        task.setDepartureLongitude(updateVO.getDepartureLongitude());
+        task.setDepartureLatitude(updateVO.getDepartureLatitude());
+        task.setDestinationLongitude(updateVO.getDestinationLongitude());
+        task.setDestinationLatitude(updateVO.getDestinationLatitude());
         task.setPlannedStartTime(updateVO.getPlannedStartTime());
         task.setPlannedEndTime(updateVO.getPlannedEndTime());
         task.setAssigneeId(updateVO.getAssigneeId());
         task.setUpdateBy(SecurityUtils.getUsername());
         task.setUpdateTime(DateUtils.getNowDate());
         task.setRemark(updateVO.getRemark());
+        
+        // 閲嶆柊璁$畻棰勮鍏噷鏁�
+        calculateEstimatedDistance(task);
         
         int result = sysTaskMapper.updateSysTask(task);
         
@@ -181,6 +294,7 @@
         task.setTaskId(taskId);
         task.setAssigneeId(assigneeId);
         task.setUpdateBy(SecurityUtils.getUsername());
+        task.setUpdateTime(DateUtils.getNowDate());
         
         int result = sysTaskMapper.assignTask(task);
         
@@ -205,6 +319,21 @@
     @Override
     @Transactional
     public int changeTaskStatus(Long taskId, TaskStatus newStatus, String remark) {
+        return changeTaskStatusWithLocation(taskId, newStatus, remark, null);
+    }
+
+    /**
+     * 鍙樻洿浠诲姟鐘舵�侊紙鍚獹PS浣嶇疆淇℃伅锛�
+     * 
+     * @param taskId 浠诲姟ID
+     * @param newStatus 鏂扮姸鎬�
+     * @param remark 澶囨敞
+     * @param locationLog GPS浣嶇疆淇℃伅鏃ュ織瀵硅薄
+     * @return 缁撴灉
+     */
+    @Override
+    @Transactional
+    public int changeTaskStatusWithLocation(Long taskId, TaskStatus newStatus, String remark, SysTaskLog locationLog) {
         SysTask oldTask = sysTaskMapper.selectSysTaskByTaskId(taskId);
         if (oldTask == null) {
             throw new RuntimeException("浠诲姟涓嶅瓨鍦�");
@@ -220,22 +349,29 @@
         task.setTaskId(taskId);
         task.setTaskStatus(newStatus.getCode());
         task.setUpdateBy(SecurityUtils.getUsername());
+        task.setUpdateTime(DateUtils.getNowDate());
         
         // 鏍规嵁鐘舵�佽缃浉搴旂殑鏃堕棿
-        if (newStatus == TaskStatus.IN_PROGRESS && oldTask.getActualStartTime() == null) {
+        if (newStatus == TaskStatus.DEPARTING && oldTask.getActualStartTime() == null) {
+            // 鍑哄彂涓細璁剧疆瀹為檯寮�濮嬫椂闂�
+            task.setActualStartTime(DateUtils.getNowDate());
+        } else if (newStatus == TaskStatus.IN_PROGRESS && oldTask.getActualStartTime() == null) {
+            // 鍏煎鏃ф暟鎹細浠诲姟涓姸鎬佷篃璁剧疆瀹為檯寮�濮嬫椂闂�
             task.setActualStartTime(DateUtils.getNowDate());
         } else if (newStatus == TaskStatus.COMPLETED) {
+            // 宸插畬鎴愶細璁剧疆瀹為檯缁撴潫鏃堕棿
             task.setActualEndTime(DateUtils.getNowDate());
         }
         
         int result = sysTaskMapper.updateTaskStatus(task);
         
-        // 璁板綍鎿嶄綔鏃ュ織
+        // 璁板綍鎿嶄綔鏃ュ織锛堝惈GPS浣嶇疆淇℃伅锛�
         if (result > 0) {
             recordTaskLog(taskId, "STATUS_CHANGE", "鐘舵�佸彉鏇�", 
                          "鐘舵�侊細" + oldTaskStatus.getInfo(), 
                          "鐘舵�侊細" + newStatus.getInfo() + "锛屽娉細" + remark, 
-                         SecurityUtils.getUserId(), SecurityUtils.getUsername());
+                         SecurityUtils.getUserId(), SecurityUtils.getUsername(),
+                         locationLog);
         }
         
         return result;
@@ -437,9 +573,33 @@
      */
     @Override
     public List<SysTaskVehicle> getAvailableVehicles(Long deptId, String taskType) {
-        // 杩欓噷闇�瑕佹牴鎹笟鍔¢�昏緫鏌ヨ鍙敤杞﹁締
-        // 鏆傛椂杩斿洖绌哄垪琛紝瀹為檯瀹炵幇闇�瑕佹煡璇㈣溅杈嗚〃
-        return new ArrayList<>();
+        List<SysTaskVehicle> availableVehicles = new ArrayList<>();
+        
+        try {
+            // 鏌ヨ鎵�鏈夌姸鎬佷负姝e父鐨勮溅杈嗭紙涓嶉檺鍒堕儴闂級
+            VehicleInfo queryParam = new VehicleInfo();
+            queryParam.setStatus("0"); // 0琛ㄧず姝e父鐘舵��
+            // 涓嶈缃甦eptId锛屾煡璇㈡墍鏈夐儴闂ㄧ殑杞﹁締
+            
+            List<VehicleInfo> vehicles = vehicleInfoMapper.selectVehicleInfoList(queryParam);
+            
+            // 杞崲涓篠ysTaskVehicle瀵硅薄
+            for (VehicleInfo vehicle : vehicles) {
+                SysTaskVehicle taskVehicle = new SysTaskVehicle();
+                taskVehicle.setVehicleId(vehicle.getVehicleId());
+                taskVehicle.setVehicleNo(vehicle.getVehicleNo());
+                taskVehicle.setVehicleType(vehicle.getVehicleType());
+                taskVehicle.setVehicleBrand(vehicle.getVehicleBrand());
+                taskVehicle.setVehicleModel(vehicle.getVehicleModel());
+                taskVehicle.setDeptName(vehicle.getDeptName()); // 娣诲姞閮ㄩ棬鍚嶇О
+                availableVehicles.add(taskVehicle);
+            }
+        } catch (Exception e) {
+            // 濡傛灉鏌ヨ澶辫触锛岃褰曟棩蹇楀苟杩斿洖绌哄垪琛�
+            System.err.println("鏌ヨ鍙敤杞﹁締澶辫触: " + e.getMessage());
+        }
+        
+        return availableVehicles;
     }
 
     /**
@@ -489,18 +649,30 @@
             task.setAttachments(sysTaskAttachmentMapper.selectSysTaskAttachmentByTaskId(taskId));
             // 鏌ヨ鎿嶄綔鏃ュ織
             task.setOperationLogs(sysTaskLogMapper.selectSysTaskLogByTaskId(taskId));
+            // 鍔犺浇鎬ユ晳杞繍鎵╁睍淇℃伅
+            if ("EMERGENCY_TRANSFER".equals(task.getTaskType())) {
+                SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+                task.setEmergencyInfo(emergencyInfo);
+            }
+            // 鍔犺浇绂忕杞︽墿灞曚俊鎭�
+            else if ("WELFARE".equals(task.getTaskType())) {
+                SysTaskWelfare welfareInfo = sysTaskWelfareMapper.selectSysTaskWelfareByTaskId(taskId);
+                task.setWelfareInfo(welfareInfo);
+            }
         }
         return task;
     }
 
+    @Autowired
+    private TaskCodeGenerator taskCodeGenerator;
+    
     /**
      * 鐢熸垚浠诲姟缂栧彿
      * 
      * @return 浠诲姟缂栧彿
      */
     private String generateTaskCode() {
-        String dateStr = DateUtils.dateTimeNow("yyyyMMdd");
-        return "TASK" + dateStr + "0001";
+        return taskCodeGenerator.generateTaskCode();
     }
 
     /**
@@ -516,7 +688,29 @@
      */
     private void recordTaskLog(Long taskId, String operationType, String operationDesc, 
                               String oldValue, String newValue, Long operatorId, String operatorName) {
-        SysTaskLog log = new SysTaskLog();
+        recordTaskLog(taskId, operationType, operationDesc, oldValue, newValue, 
+                     operatorId, operatorName, null);
+    }
+
+    /**
+     * 璁板綍浠诲姟鎿嶄綔鏃ュ織锛堝惈GPS浣嶇疆淇℃伅锛�
+     * 
+     * @param taskId 浠诲姟ID
+     * @param operationType 鎿嶄綔绫诲瀷
+     * @param operationDesc 鎿嶄綔鎻忚堪
+     * @param oldValue 鎿嶄綔鍓嶅��
+     * @param newValue 鎿嶄綔鍚庡��
+     * @param operatorId 鎿嶄綔浜篒D
+     * @param operatorName 鎿嶄綔浜哄鍚�
+     * @param log GPS浣嶇疆淇℃伅鏃ュ織瀵硅薄锛堝彲涓簄ull锛�
+     */
+    private void recordTaskLog(Long taskId, String operationType, String operationDesc, 
+                              String oldValue, String newValue, Long operatorId, String operatorName,
+                              SysTaskLog log) {
+        if (log == null) {
+            log = new SysTaskLog();
+        }
+        
         log.setTaskId(taskId);
         log.setOperationType(operationType);
         log.setOperationDesc(operationDesc);
@@ -564,4 +758,128 @@
         }
         return "";
     }
+
+    /**
+     * 璁$畻棰勮鍏噷鏁�
+     * 
+     * @param task 浠诲姟瀵硅薄
+     */
+    private void calculateEstimatedDistance(SysTask task) {
+        if (task.getDepartureLongitude() != null && task.getDepartureLatitude() != null &&
+            task.getDestinationLongitude() != null && task.getDestinationLatitude() != null) {
+            
+            // 楠岃瘉GPS鍧愭爣鏄惁鏈夋晥
+            if (GpsDistanceUtils.isValidCoordinate(task.getDepartureLatitude(), task.getDepartureLongitude()) &&
+                GpsDistanceUtils.isValidCoordinate(task.getDestinationLatitude(), task.getDestinationLongitude())) {
+                
+                // 璁$畻璺濈
+                java.math.BigDecimal distance = GpsDistanceUtils.calculateDistance(
+                    task.getDepartureLatitude(), task.getDepartureLongitude(),
+                    task.getDestinationLatitude(), task.getDestinationLongitude()
+                );
+                
+                task.setEstimatedDistance(distance);
+            } else {
+                // 鍧愭爣鏃犳晥锛岃缃负0
+                task.setEstimatedDistance(java.math.BigDecimal.ZERO);
+            }
+        } else {
+            // 鍧愭爣涓嶅畬鏁达紝璁剧疆涓�0
+            task.setEstimatedDistance(java.math.BigDecimal.ZERO);
+        }
+    }
+
+    /**
+     * 淇濆瓨鎬ユ晳杞繍浠诲姟鎵╁睍淇℃伅
+     * 
+     * @param taskId 浠诲姟ID
+     * @param createVO 浠诲姟鍒涘缓瀵硅薄
+     */
+    private void saveEmergencyInfo(Long taskId, TaskCreateVO createVO) {
+        SysTaskEmergency emergencyInfo = new SysTaskEmergency();
+        emergencyInfo.setTaskId(taskId);
+        
+        // 璁剧疆鎮h�呬俊鎭�
+        if (createVO.getPatient() != null) {
+            emergencyInfo.setPatientContact(createVO.getPatient().getContact());
+            emergencyInfo.setPatientPhone(createVO.getPatient().getPhone());
+            emergencyInfo.setPatientName(createVO.getPatient().getName());
+            emergencyInfo.setPatientGender(createVO.getPatient().getGender());
+            emergencyInfo.setPatientIdCard(createVO.getPatient().getIdCard());
+            emergencyInfo.setPatientCondition(createVO.getPatient().getCondition());
+        }
+        
+        // 璁剧疆杞嚭鍖婚櫌淇℃伅
+        if (createVO.getHospitalOut() != null) {
+            emergencyInfo.setHospitalOutName(createVO.getHospitalOut().getName());
+            emergencyInfo.setHospitalOutDepartment(createVO.getHospitalOut().getDepartment());
+            emergencyInfo.setHospitalOutBedNumber(createVO.getHospitalOut().getBedNumber());
+            emergencyInfo.setHospitalOutAddress(createVO.getHospitalOut().getAddress());
+            emergencyInfo.setHospitalOutLongitude(createVO.getHospitalOut().getLongitude());
+            emergencyInfo.setHospitalOutLatitude(createVO.getHospitalOut().getLatitude());
+        }
+        
+        // 璁剧疆杞叆鍖婚櫌淇℃伅
+        if (createVO.getHospitalIn() != null) {
+            emergencyInfo.setHospitalInName(createVO.getHospitalIn().getName());
+            emergencyInfo.setHospitalInDepartment(createVO.getHospitalIn().getDepartment());
+            emergencyInfo.setHospitalInBedNumber(createVO.getHospitalIn().getBedNumber());
+            emergencyInfo.setHospitalInAddress(createVO.getHospitalIn().getAddress());
+            emergencyInfo.setHospitalInLongitude(createVO.getHospitalIn().getLongitude());
+            emergencyInfo.setHospitalInLatitude(createVO.getHospitalIn().getLatitude());
+        }
+        
+        // 璁剧疆璐圭敤淇℃伅
+        emergencyInfo.setTransferDistance(createVO.getTransferDistance());
+        emergencyInfo.setTransferPrice(createVO.getPrice());
+        
+        // 绯荤粺瀛楁
+        emergencyInfo.setCreateTime(DateUtils.getNowDate());
+        emergencyInfo.setUpdateTime(DateUtils.getNowDate());
+        emergencyInfo.setCreateBy(SecurityUtils.getUsername());
+        emergencyInfo.setUpdateBy(SecurityUtils.getUsername());
+        
+        sysTaskEmergencyMapper.insertSysTaskEmergency(emergencyInfo);
+    }
+
+    /**
+     * 淇濆瓨绂忕杞︿换鍔℃墿灞曚俊鎭�
+     * 
+     * @param taskId 浠诲姟ID
+     * @param createVO 浠诲姟鍒涘缓瀵硅薄
+     */
+    private void saveWelfareInfo(Long taskId, TaskCreateVO createVO) {
+        SysTaskWelfare welfareInfo = new SysTaskWelfare();
+        welfareInfo.setTaskId(taskId);
+        
+        // 璁剧疆涔樺淇℃伅
+        if (createVO.getPassenger() != null) {
+            welfareInfo.setPassengerContact(createVO.getPassenger().getContact());
+            welfareInfo.setPassengerPhone(createVO.getPassenger().getPhone());
+        }
+        
+        // 璁剧疆鍦板潃淇℃伅
+        welfareInfo.setPickupAddress(createVO.getStartAddress());
+        welfareInfo.setDestinationAddress(createVO.getEndAddress());
+        
+        // 璁剧疆GPS鍧愭爣
+        welfareInfo.setPickupLongitude(createVO.getDepartureLongitude());
+        welfareInfo.setPickupLatitude(createVO.getDepartureLatitude());
+        welfareInfo.setDestinationLongitude(createVO.getDestinationLongitude());
+        welfareInfo.setDestinationLatitude(createVO.getDestinationLatitude());
+        
+        // 璁剧疆璺濈鍜岃垂鐢�
+        // 浼樺厛浣跨敤绂忕杞︿笓鐢ㄧ殑distance瀛楁锛屽鏋滄病鏈夊垯浣跨敤閫氱敤鐨別stimatedDistance
+        BigDecimal serviceDistance = createVO.getDistance() != null ? createVO.getDistance() : createVO.getEstimatedDistance();
+        welfareInfo.setServiceDistance(serviceDistance);
+        welfareInfo.setServicePrice(createVO.getPrice());
+        
+        // 绯荤粺瀛楁
+        welfareInfo.setCreateTime(DateUtils.getNowDate());
+        welfareInfo.setUpdateTime(DateUtils.getNowDate());
+        welfareInfo.setCreateBy(SecurityUtils.getUsername());
+        welfareInfo.setUpdateBy(SecurityUtils.getUsername());
+        
+        sysTaskWelfareMapper.insertSysTaskWelfare(welfareInfo);
+    }
 }

--
Gitblit v1.9.1