|
@@ -13,6 +13,7 @@ import com.sckw.core.utils.*;
|
|
|
import com.sckw.core.web.constant.HttpStatus;
|
|
import com.sckw.core.web.constant.HttpStatus;
|
|
|
import com.sckw.core.web.context.LoginUserHolder;
|
|
import com.sckw.core.web.context.LoginUserHolder;
|
|
|
import com.sckw.core.web.response.HttpResult;
|
|
import com.sckw.core.web.response.HttpResult;
|
|
|
|
|
+import com.sckw.excel.utils.DateUtil;
|
|
|
import com.sckw.fleet.api.RemoteFleetService;
|
|
import com.sckw.fleet.api.RemoteFleetService;
|
|
|
import com.sckw.fleet.api.model.vo.RDriverVo;
|
|
import com.sckw.fleet.api.model.vo.RDriverVo;
|
|
|
import com.sckw.fleet.api.model.vo.RTruckVo;
|
|
import com.sckw.fleet.api.model.vo.RTruckVo;
|
|
@@ -40,7 +41,6 @@ import com.sckw.transport.model.vo.WaybillCountVo;
|
|
|
import com.sckw.transport.model.vo.WaybillOrderDriverVo;
|
|
import com.sckw.transport.model.vo.WaybillOrderDriverVo;
|
|
|
import jakarta.annotation.Resource;
|
|
import jakarta.annotation.Resource;
|
|
|
import jakarta.validation.Valid;
|
|
import jakarta.validation.Valid;
|
|
|
-import jodd.util.StringUtil;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -2202,16 +2202,16 @@ public class KwtWaybillOrderService {
|
|
|
result.put("loadStatus", loadTicket != null ? 0 : 1);
|
|
result.put("loadStatus", loadTicket != null ? 0 : 1);
|
|
|
result.put("loadAmount", loadTicket != null ? loadTicket.getAmount() : null);
|
|
result.put("loadAmount", loadTicket != null ? loadTicket.getAmount() : null);
|
|
|
result.put("loadUrls", loadTicket != null ? FileUtils.spliceBatch(loadTicket.getUrls()) : null);
|
|
result.put("loadUrls", loadTicket != null ? FileUtils.spliceBatch(loadTicket.getUrls()) : null);
|
|
|
- result.put("loadOperateTime", loadTicket != null ? loadTicket.getOperateTime() : null);
|
|
|
|
|
- result.put("loadCreateTime", loadTicket != null ? loadTicket.getCreateTime() : null);
|
|
|
|
|
|
|
+ result.put("loadOperateTime", loadTicket != null ? DateUtil.dateTimeFormatter(loadTicket.getOperateTime()) : null);
|
|
|
|
|
+ result.put("loadCreateTime", loadTicket != null ? DateUtil.dateTimeFormatter(loadTicket.getCreateTime()) : null);
|
|
|
result.put("loadCreateByName", usersMap.get(loadTicket.getUpdateBy()));
|
|
result.put("loadCreateByName", usersMap.get(loadTicket.getUpdateBy()));
|
|
|
result.put("loadCityName", loadAddress != null ? loadAddress.getCityName() : null);
|
|
result.put("loadCityName", loadAddress != null ? loadAddress.getCityName() : null);
|
|
|
result.put("loadDetailAddress", loadAddress != null ? loadAddress.getDetailAddress() : null);
|
|
result.put("loadDetailAddress", loadAddress != null ? loadAddress.getDetailAddress() : null);
|
|
|
result.put("unloadStatus", loadTicket != null ? 0 : 1);
|
|
result.put("unloadStatus", loadTicket != null ? 0 : 1);
|
|
|
result.put("unloadAmount", unloadTicket != null ? unloadTicket.getAmount() : null);
|
|
result.put("unloadAmount", unloadTicket != null ? unloadTicket.getAmount() : null);
|
|
|
result.put("unloadUrls", unloadTicket != null ? FileUtils.spliceBatch(unloadTicket.getUrls()) : null);
|
|
result.put("unloadUrls", unloadTicket != null ? FileUtils.spliceBatch(unloadTicket.getUrls()) : null);
|
|
|
- result.put("unloadOperateTime", unloadTicket != null ? unloadTicket.getOperateTime() : null);
|
|
|
|
|
- result.put("unloadCreateTime", unloadTicket != null ? unloadTicket.getCreateTime() : null);
|
|
|
|
|
|
|
+ result.put("unloadOperateTime", unloadTicket != null ? DateUtil.dateTimeFormatter(unloadTicket.getOperateTime()) : null);
|
|
|
|
|
+ result.put("unloadCreateTime", unloadTicket != null ? DateUtil.dateTimeFormatter(unloadTicket.getCreateTime()) : null);
|
|
|
result.put("unloadCreateByName", usersMap.get(unloadTicket.getUpdateBy()));
|
|
result.put("unloadCreateByName", usersMap.get(unloadTicket.getUpdateBy()));
|
|
|
result.put("unloadCityName", unloadAddress != null ? unloadAddress.getCityName() : null);
|
|
result.put("unloadCityName", unloadAddress != null ? unloadAddress.getCityName() : null);
|
|
|
result.put("unloadDetailAddress", unloadAddress != null ? unloadAddress.getDetailAddress() : null);
|
|
result.put("unloadDetailAddress", unloadAddress != null ? unloadAddress.getDetailAddress() : null);
|