wlzboy
6 小时以前 5f2ee03958a1a16dc27195c76ea7cffb422c95d1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysEmergencyTaskServiceImpl.java
@@ -41,7 +41,7 @@
    @Override
    public void saveEmergencyInfo(Long taskId, String createUserName, TaskCreateVO createVO,
                                  String serviceOrderId, String dispatchOrderId, String serviceOrdNo) {
                                  Long serviceOrderId, Long dispatchOrderId, String serviceOrdNo) {
        SysTaskEmergency emergencyInfo = new SysTaskEmergency();
        emergencyInfo.setTaskId(taskId);
@@ -110,7 +110,7 @@
            }
        }
        emergencyInfo.setTransferDistance(createVO.getTransferDistance());
        emergencyInfo.setTransferDistance(createVO.getDistance());
        emergencyInfo.setTransferPrice(createVO.getPrice());
        emergencyInfo.setDocumentTypeId(createVO.getDocumentTypeId());
        emergencyInfo.setTaskTypeId(createVO.getTaskTypeId());
@@ -123,13 +123,13 @@
        }
        if (serviceOrderId != null) {
            emergencyInfo.setLegacyServiceOrdId(Long.parseLong(serviceOrderId));
            emergencyInfo.setLegacyServiceOrdId(serviceOrderId);
            emergencyInfo.setSyncStatus(2);
            emergencyInfo.setSyncTime(DateUtils.getNowDate());
            emergencyInfo.setSyncErrorMsg("旧系统同步过来");
        }
        if (dispatchOrderId != null) {
            emergencyInfo.setLegacyDispatchOrdId(Long.parseLong(dispatchOrderId));
            emergencyInfo.setLegacyDispatchOrdId(dispatchOrderId);
            emergencyInfo.setDispatchSyncStatus(2);
            emergencyInfo.setDispatchSyncTime(DateUtils.getNowDate());
            emergencyInfo.setDispatchSyncErrorMsg("旧系统同步过来");
@@ -266,8 +266,8 @@
            }
        }
        if (updateVO.getTransferDistance() != null) {
            oldEmergency.setTransferDistance(updateVO.getTransferDistance());
        if (updateVO.getDistance() != null) {
            oldEmergency.setTransferDistance(updateVO.getDistance());
        }
        if (updateVO.getPrice() != null) {
            oldEmergency.setTransferPrice(updateVO.getPrice());
@@ -428,8 +428,8 @@
        }
        
        // 更新费用信息
        if (createVO.getTransferDistance() != null) {
            existingInfo.setTransferDistance(createVO.getTransferDistance());
        if (createVO.getDistance() != null) {
            existingInfo.setTransferDistance(createVO.getDistance());
        }
        if (createVO.getPrice() != null) {
            existingInfo.setTransferPrice(createVO.getPrice());
@@ -484,6 +484,7 @@
        }
        try {
            sysTaskEmergencyService.markNeedResync(taskId);
        } catch (Exception e) {
            // 标记失败不影响主流程
        }