update 更新返回图片全地址及时分秒追加替换

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -14,10 +14,7 @@ import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
 import com.sckw.core.model.page.PageResult;
-import com.sckw.core.utils.BeanUtils;
-import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.IdWorker;
-import com.sckw.core.utils.StringUtils;
+import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
@@ -520,10 +517,10 @@ public class TransportCommonService {
         SysDictResDto sysDictResDto = remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.TRADE_TYPE.getType(), logisticsOrderParam.getPayment());
         String dictValue = sysDictResDto == null ? null : sysDictResDto.getValue();
         if (StringUtils.isNotBlank(logisticsOrderParam.getStartTime())) {
-            logisticsOrderParam.setStartTime(logisticsOrderParam.getStartTime() + " 00:00:00");
+            logisticsOrderParam.setStartTime(StringTimeUtil.fillStart(logisticsOrderParam.getStartTime()));
         }
         if (StringUtils.isNotBlank(logisticsOrderParam.getEndTime())) {
-            logisticsOrderParam.setEndTime(logisticsOrderParam.getEndTime() + " 23:59:59");
+            logisticsOrderParam.setEndTime(StringTimeUtil.fillEnd(logisticsOrderParam.getEndTime()));
         }
         Integer page = logisticsOrderParam.getPage();
         Long entId = LoginUserHolder.getEntId();

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -7,10 +7,7 @@ import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.CarWaybillQueryEnum;
 import com.sckw.core.model.page.PageResult;
-import com.sckw.core.utils.BeanUtils;
-import com.sckw.core.utils.CollectionUtils;
-import com.sckw.core.utils.StringTimeUtil;
-import com.sckw.core.utils.StringUtils;
+import com.sckw.core.utils.*;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.DateUtil;
@@ -176,14 +173,14 @@ public class WaybillManagementService {
                             waybillTicketVO.setLoadTime(waybillOrderTicket.getOperateTime() == null ? null : DateUtil.getDateTime(waybillOrderTicket.getOperateTime()));
                         }
                         waybillTicketVO.setLoadWeight(String.valueOf(info.getLoadAmount()));
-                        waybillTicketVO.setLoadUrl(String.valueOf(info.getLoadUrls()));
+                        waybillTicketVO.setLoadUrl(FileUtils.splice(String.valueOf(info.getLoadUrls())));
                     }
                     if (waybillOrderTicket.getType() == 2) {
                         if (info.getUnloadTime() != null) {
                             waybillTicketVO.setUnloadTime(waybillOrderTicket.getOperateTime() == null ? null : DateUtil.getDateTime(waybillOrderTicket.getOperateTime()));
                         }
                         waybillTicketVO.setUnloadWeight(String.valueOf(info.getUnloadAmount()));
-                        waybillTicketVO.setUnloadUrl(String.valueOf(info.getUnloadUrls()));
+                        waybillTicketVO.setUnloadUrl(FileUtils.splice(String.valueOf(info.getUnloadUrls())));
                     }
                 }
             }
@@ -396,8 +393,8 @@ public class WaybillManagementService {
             waybillBoardListVO.setTruckNo(String.valueOf(sckwWaybillOrder.getTruckNo()));
             waybillBoardListVO.setLoadGrossAmount(sckwWaybillOrder.getLoadGrossAmount() != null ? String.valueOf(sckwWaybillOrder.getLoadGrossAmount()) : null);
             waybillBoardListVO.setUnloadGrossAmount(sckwWaybillOrder.getUnloadGrossAmount() != null ? String.valueOf(sckwWaybillOrder.getUnloadGrossAmount()) : null);
-            waybillBoardListVO.setLoadUrls(sckwWaybillOrder.getLoadUrls());
-            waybillBoardListVO.setUnloadUrls(sckwWaybillOrder.getUnloadUrls());
+            waybillBoardListVO.setLoadUrls(FileUtils.splice(sckwWaybillOrder.getLoadUrls()));
+            waybillBoardListVO.setUnloadUrls(FileUtils.splice(sckwWaybillOrder.getUnloadUrls()));
 
             List<WaybillStatusVO> statusVOS2 = new ArrayList<>();
             statusVOS.forEach(e -> {
@@ -722,10 +719,10 @@ public class WaybillManagementService {
     public HttpResult waybillDataStatisticApp(String keyword, String startDate, String endDate) {
         Long entId = LoginUserHolder.getEntId();
         if (StringUtils.isNotBlank(startDate)) {
-            startDate = startDate.concat(" 00:00:00");
+            startDate = StringTimeUtil.fillStart(startDate);
         }
         if (StringUtils.isNotBlank(endDate)) {
-            endDate = endDate.concat(" 00:00:00");
+            endDate = StringTimeUtil.fillEnd(endDate);
         }
         // 运输途中
         Map<String, String> _onway = new HashMap<>();
@@ -883,8 +880,8 @@ public class WaybillManagementService {
                 LoginUserHolder.getAuthUserIdList(),
                 _statuses,
                 query.getKeyword(),
-                StringUtils.isBlank(query.getStartDate()) ? null : query.getStartDate().concat(" 00:00:00"),
-                StringUtils.isBlank(query.getEndDate()) ? null : query.getEndDate().concat(" 23:59:59")
+                StringUtils.isBlank(query.getStartDate()) ? null : StringTimeUtil.fillStart(query.getStartDate()),
+                StringUtils.isBlank(query.getEndDate()) ? null : StringTimeUtil.fillEnd(query.getEndDate())
         );
         Map<String, String> amount = new HashMap<>();
         // 总计条数