Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/file/FileInfo.java

@@ -75,6 +75,7 @@ public class FileInfo implements Serializable {
 
     @NotNull(message = "文件删除标志不能为空")
     private Integer delFlag;
+
     @NotNull(message = "文件状态不能为空")
     private Integer status;
 

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/DateUtils.java

@@ -12,6 +12,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Objects;
 
+
 /**
  * 日期处理
  *
@@ -508,10 +509,7 @@ public class DateUtils extends DateUtil {
     }
 
     public static void main(String[] ager) throws InterruptedException {
-        Date newTime = new Date();
-        Date time = addDateMinutes(new Date(), 10);
-        int result = newTime.compareTo(time);
-        System.out.println(result);
+        System.out.println(getEndOfDay(new Date()));
     }
 
     /**
@@ -730,6 +728,38 @@ public class DateUtils extends DateUtil {
         return formatDate(time);
     }
 
+    /**
+     * @desc: 一天的开始时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     */
+    public static Date getStartOfDay(Date date) {
+        String dateStr = format(date, DATE_PATTERN);
+        return parse(dateStr, DATE_PATTERN);
+    }
+
+    /**
+     * @desc: 一天的开始时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     */
+    public static Date getStartOfDay(Date date, String format) {
+        String dateStr = format(date, format);
+        return parse(dateStr, format);
+    }
+
+    /**
+     * @desc: 一天的结束时间
+     * @author: yzc
+     * @date: 2023-09-27 9:52
+     */
+    public static Date getEndOfDay(Date date) {
+        String dateStr = format(date, DATE_PATTERN);
+        return parse(dateStr + " 23:59:59", DATE_TIME_PATTERN);
+    }
+
+
+
     /**
      * @desc: localDate转换为date 结束时间
      * @author: yzc

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/response/HttpResult.java

@@ -78,4 +78,12 @@ public class HttpResult implements Serializable {
 		r.setData(data);
 		return r;
 	}
+
+    public static HttpResult ok(int code,String msg, Object data) {
+        HttpResult r = new HttpResult();
+        r.setCode(code);
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
+    }
 }

sckw-common/sckw-common-excel/src/main/java/com/sckw/excel/utils/DateUtil.java

@@ -76,13 +76,21 @@ public class DateUtil {
         return format;
     }
 
-    public static LocalDate localDateToLocalDate(LocalDate date) {
+    public static LocalDateTime localDateToLocalDateEnd(LocalDate date) {
         String str = dateToStr(date, "yyyy-MM-dd") + " 23:59:59";
 //        LocalDate localDate = parseLocalDate(str);
-        LocalDate localDate = LocalDate.parse(str, YYYY_MM_DD_HH_MM_SS);
-        return localDate;
+        LocalDateTime localDateTime = LocalDateTime.parse(str, YYYY_MM_DD_HH_MM_SS);
+        return localDateTime;
+    }
+
+    public static LocalDateTime localDateToLocalDateStart(LocalDate date) {
+        String str = dateToStr(date, "yyyy-MM-dd") + " 00:00:00";
+//        LocalDate localDate = parseLocalDate(str);
+        LocalDateTime localDateTime = LocalDateTime.parse(str, YYYY_MM_DD_HH_MM_SS);
+        return localDateTime;
     }
 
+
     public static String dateToStr(LocalDate date) {
         return dateToStr(date, "yyyy-MM-dd");
     }

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -2,6 +2,7 @@ package com.sckw.contract.service;
 
 import java.util.Date;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -192,7 +193,9 @@ public class KwcContractLogisticsService {
         kwcContractLogistics.setSigningWay(baseInfo.getSigningWay());
         kwcContractLogistics.setCharging(baseInfo.getCharging());
         kwcContractLogistics.setStartTime(baseInfo.getStartTime());
-        kwcContractLogistics.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractLogistics.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractLogistics.setPerformedAmount(new BigDecimal("0"));
         kwcContractLogistics.setContractPid(pid);
         kwcContractLogistics.setRemark(remark);
@@ -512,6 +515,9 @@ public class KwcContractLogisticsService {
         kwcContractLogistics.setCharging(baseInfo.getCharging());
         kwcContractLogistics.setStartTime(baseInfo.getStartTime());
         kwcContractLogistics.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractLogistics.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractLogistics.setPerformedAmount(new BigDecimal("0"));
         kwcContractLogistics.setContractPid(reqVo.getPid());
         kwcContractLogistics.setRemark(reqVo.getRemark());
@@ -722,6 +728,10 @@ public class KwcContractLogisticsService {
             queryListResVo.setSigningWay(queryListResDto.getSigningWay());
             queryListResVo.setPerformedAmount(queryListResDto.getPerformedAmount());
             queryListResVo.setAmount(queryListResDto.getAmount());
+
+            if (Objects.nonNull(queryListResVo.getEndTime())) {
+                queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
+            }
             list.add(queryListResVo);
         }
         return list;

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -3,6 +3,9 @@ package com.sckw.contract.service;
 import java.io.IOException;
 import java.util.Date;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -197,6 +200,10 @@ public class KwcContractTradeService {
             queryListResVo.setSigningWay(queryListResDto.getSigningWay());
             queryListResVo.setAmount(queryListResDto.getAmount());
             queryListResVo.setPerformedAmount(queryListResDto.getPerformedAmount());
+
+            if(Objects.nonNull(queryListResVo.getEndTime())) {
+                queryListResVo.setEndTime(DateUtils.getStartOfDay(queryListResVo.getEndTime()));
+            }
             list.add(queryListResVo);
         }
         return list;
@@ -276,7 +283,9 @@ public class KwcContractTradeService {
         kwcContractTrade.setSigningWay(baseInfo.getSigningWay());
         kwcContractTrade.setTrading(baseInfo.getTrading());
         kwcContractTrade.setStartTime(baseInfo.getStartTime());
-        kwcContractTrade.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractTrade.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractTrade.setPerformedAmount(new BigDecimal("0"));
         kwcContractTrade.setContractPid(pid);
         kwcContractTrade.setRemark(remark);
@@ -586,6 +595,9 @@ public class KwcContractTradeService {
         kwcContractTrade.setTrading(baseInfo.getTrading());
         kwcContractTrade.setStartTime(baseInfo.getStartTime());
         kwcContractTrade.setEndTime(baseInfo.getEndTime());
+        if (Objects.nonNull(baseInfo.getEndTime())) {
+            kwcContractTrade.setEndTime(DateUtils.getEndOfDay(baseInfo.getEndTime()));
+        }
         kwcContractTrade.setPerformedAmount(new BigDecimal("0"));
         kwcContractTrade.setContractPid(reqVo.getPid());
         kwcContractTrade.setRemark(reqVo.getRemark());

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -3,11 +3,10 @@ package com.sckw.file.controller;
 import com.sckw.core.model.file.FileInfo;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.result.Result;
 import com.sckw.core.web.response.result.Status;
 import com.sckw.file.api.dto.FileInfoDTO;
-import com.sckw.file.service.FileService;
 import com.sckw.file.dubbo.FileDubboApiServiceImpl;
+import com.sckw.file.service.FileService;
 import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -139,13 +138,13 @@ public class FileApiController {
      * @param file
      * @return
      */
-    @RequestMapping(value = "/appUploadFileInfo", method = RequestMethod.POST)
-    public Result appUploadFileInfo(@RequestParam("file") MultipartFile file) {
+    @RequestMapping(value = "/appUploadFileInfo", method = RequestMethod.POST,produces = "application/json")
+    public HttpResult appUploadFileInfo(@RequestParam("file") MultipartFile file) {
         try {
             return fileService.appUploadFileInfo(file);
         } catch (Exception e) {
             log.info("上传文件失败:{}",e.getMessage(),e);
-            return Result.build(Status.FAILURE,"上传文件失败:" + e.getMessage());
+            return HttpResult.error(Status.FAILURE.getCode(),"上传文件失败:" + e.getMessage());
         }
     }
 

sckw-modules/sckw-file/src/main/java/com/sckw/file/service/FileService.java

@@ -13,7 +13,6 @@ import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.result.Result;
 import com.sckw.core.web.response.result.Status;
 import com.sckw.file.api.dto.FileInfoDTO;
 import com.sckw.file.config.FileListConfig;
@@ -264,7 +263,7 @@ public class FileService {
         return HttpResult.ok(fileInfoVO);
     }
 
-    private void insertFile(FileInfo fileInfo) throws ParseException {
+    private void insertFile(FileInfo fileInfo){
         kwfFileInfo kwfFileInfo = new kwfFileInfo();
         kwfFileInfo.setOriginalName(fileInfo.getFileOriginalName());
         kwfFileInfo.setFileSuffix(FilenameUtils.getExtension(fileInfo.getFileOriginalName()));
@@ -284,10 +283,11 @@ public class FileService {
     }
 
 
-    public Result appUploadFileInfo(MultipartFile file) throws ParseException {
+    @Transactional
+    public HttpResult appUploadFileInfo(MultipartFile file){
         boolean flag = checkFileFormat(file);
         if (!flag) {
-            return Result.build(Status.FAILURE, "上传文件格式错误!");
+            return HttpResult.error(Status.FAILURE.getCode(), "上传文件格式错误!");
         }
         FileInfo fileInfo = FileUtils.getFileDataList(file);
         fileInfo.setType(FileEnum.FILE_STORE_TYPE_OSS.getFileType());
@@ -295,7 +295,7 @@ public class FileService {
         FileInfoVO fileInfoVO = new FileInfoVO();
         BeanUtils.copyProperties(returnFileInfo, fileInfoVO);
         insertFile(returnFileInfo);
-        return Result.build(Status.SUCCESS, fileInfoVO);
+        return HttpResult.ok(Status.SUCCESS.getCode(),"", fileInfoVO);
     }
 
     /**

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/ManagementCarWaybillVo.java

@@ -32,6 +32,12 @@ public class ManagementCarWaybillVo implements Serializable {
     @JsonProperty(value="wOrderNo")
     private String wOrderNo;
 
+    /**
+     * 承运订单号
+     */
+    @JsonProperty(value="lOrderNo")
+    private String lOrderNo;
+
     /**
      * 车辆牌照
      */

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

@@ -131,6 +131,8 @@ public class ManagementWaybillOrderService {
         if (CollectionUtils.isNotEmpty(list)) {
             for (SckwWaybillOrder waybillOrder : list) {
                 ManagementCarWaybillVo vo = new ManagementCarWaybillVo();
+                vo.setLOrderNo(waybillOrder.getLOrderNo() == null ?
+                        null : waybillOrder.getLOrderNo());
                 vo.setWOrderNo(waybillOrder.getWOrderNo() == null ?
                         null : waybillOrder.getWOrderNo());
                 vo.setWOrderId(waybillOrder.getWOrderId() == null ?

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

@@ -337,11 +337,16 @@ public class WaybillManagementService {
         List<Integer> statuses = initWaybillIndexStatus();
         // 初始化各状态
         List<WaybillStatusVO> statusVOS = new ArrayList<>();
+        // 已作废
+        List<Integer> abortStatues = new ArrayList<>();
+        abortStatues.add(CarWaybillQueryEnum.REJECT_ORDER.getCode());
+        abortStatues.add(CarWaybillEnum.REFUSE_TRAFFIC.getCode());
+        abortStatues.add(CarWaybillEnum.REVOKED.getCode());
         statuses.forEach(e -> {
             WaybillStatusVO waybillStatusVO = new WaybillStatusVO();
             waybillStatusVO.setStatus(false);
-            if(e.equals(CarWaybillEnum.PENDING_ORDER.getCode())) {
-                // 默认选中 待接单 状态
+            if(e.equals(CarWaybillEnum.PENDING_ORDER.getCode()) && !abortStatues.contains(e)) {
+                // 默认选中 待接单 状态, 已作废的不选中
                 waybillStatusVO.setStatus(true);
             }
             waybillStatusVO.setCode(e);
@@ -783,6 +788,13 @@ public class WaybillManagementService {
         if (CollectionUtils.isNotEmpty(_statuses)) {
             criteria.and("status").in(_statuses);
         }
+        // 查询时间段
+        if (Objects.nonNull(query.getStartDate()) && Objects.nonNull(query.getEndDate())) {
+            Date endDate = DateUtil.strDateTimeToDateTime(query.getEndDate());
+            criteria.and("createTime")
+                    .gte(DateUtil.strDateTimeToDateTime(query.getStartDate()))
+                    .lte(DateUtil.offsetDay(endDate, 1));
+        }
         Query queryFormat = new Query(criteria);
         // 总记录数
         long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);