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

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

@@ -689,6 +689,9 @@ public class DateUtils extends DateUtil {
      * @return: java.util.Date
      */
     public static Date formatDate(LocalDateTime time) {
+        if (Objects.isNull(time)) {
+            return null;
+        }
         return Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
     }
 
@@ -700,6 +703,9 @@ public class DateUtils extends DateUtil {
      * @return: java.time.LocalDate
      */
     public static LocalDate dateToLocalDate(Date date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
     }
 
@@ -712,6 +718,9 @@ public class DateUtils extends DateUtil {
      * @return: java.lang.String
      */
     public static String localDateToString(LocalDate date, String pattern) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern(pattern);
         return date.format(fmt);
     }
@@ -724,6 +733,9 @@ public class DateUtils extends DateUtil {
      * @return: java.util.Date
      */
     public static Date localDateToDateStart(LocalDate localDate) {
+        if (Objects.isNull(localDate)) {
+            return null;
+        }
         LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MIN);
         return formatDate(time);
     }
@@ -744,6 +756,9 @@ public class DateUtils extends DateUtil {
      * @date: 2023-09-27 9:52
      */
     public static Date getStartOfDay(Date date, String format) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         String dateStr = format(date, format);
         return parse(dateStr, format);
     }
@@ -754,6 +769,9 @@ public class DateUtils extends DateUtil {
      * @date: 2023-09-27 9:52
      */
     public static Date getEndOfDay(Date date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
         String dateStr = format(date, DATE_PATTERN);
         return parse(dateStr + " 23:59:59", DATE_TIME_PATTERN);
     }
@@ -768,7 +786,10 @@ public class DateUtils extends DateUtil {
      * @return: java.util.Date
      */
     public static Date localDateToDateEnd(LocalDate localDate) {
-        LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MAX);
+        if (Objects.isNull(localDate)) {
+            return null;
+        }
+        LocalDateTime time = LocalDateTime.of(localDate, LocalTime.MAX).withNano(0);
         return formatDate(time);
     }
 }

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwTradeOrder.java

@@ -9,7 +9,6 @@ import lombok.experimental.Accessors;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -80,14 +79,14 @@ public class SckwTradeOrder {
     /**
      * 订单开始日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate startTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
 
     /**
      * 订单结束日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDate endTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
 
     /**
      * 订单已委托量

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoProject.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 项目管理
@@ -34,11 +34,11 @@ public class KwoProject extends BaseModel {
     /**
      * 开始日期
      */
-    private LocalDate startTime;
+    private Date startTime;
 
     /**
      * 结束日期
      */
-    private LocalDate entTime;
+    private Date entTime;
 
 }

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTradeOrder.java

@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 交易订单（采购订单/销售订单）
@@ -77,12 +77,12 @@ public class KwoTradeOrder extends BaseModel implements Serializable {
     /**
      * 开始日期
      */
-    private LocalDate startTime;
+    private Date startTime;
 
     /**
      * 结束日期
      */
-    private LocalDate endTime;
+    private Date endTime;
 
     /**
      * 已委托量

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/KwoTransportDemand.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDate;
+import java.util.Date;
 
 /**
  * @desc: 运需
@@ -62,9 +62,9 @@ public class KwoTransportDemand extends BaseModel implements Serializable {
     private String amount;
 
     /**
-     * 截止时间(yyyy-MM-dd)
+     * 截止时间
      */
-    private LocalDate deadline;
+    private Date deadline;
 
     /**
      * 联系人姓名

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -122,7 +122,10 @@ public class KwoTradeOrderService {
      */
     public void addPurchaseOrderDraft(PurchaseOrderDraftParam param) {
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(Objects.nonNull(param.getGoodsInfo()) ? param.getGoodsInfo().getUnit() : null)
                 .setSource(OrderSourceEnum.PURCHASE.getType()).setStatus(OrderStatusEnum.SAVED.getCode());
         kwoTradeOrderMapper.insert(order);
@@ -264,7 +267,10 @@ public class KwoTradeOrderService {
      */
     public void addValetOrderDraft(ValetOrderDraftParam param) {
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(Objects.nonNull(param.getGoodsInfo()) ? param.getGoodsInfo().getUnit() : null)
                 .setSource(OrderSourceEnum.SALE.getType()).setStatus(OrderStatusEnum.SAVED.getCode());
         kwoTradeOrderMapper.insert(order);
@@ -289,7 +295,10 @@ public class KwoTradeOrderService {
                 .setOrderSource(OrderSourceEnum.PURCHASE.getType());
         orderCheck(orderCheck, false);
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setUnit(param.getGoodsInfo().getUnit())
                 .setSource(OrderSourceEnum.PURCHASE.getType())
                 .setStatus(OrderStatusEnum.WAIT_ACCEPTED.getCode());
@@ -486,8 +495,12 @@ public class KwoTradeOrderService {
         contractCheck(contract);
         param.setContractInfo(contract);
         KwoTradeOrder order = BeanUtils.copyProperties(param, KwoTradeOrder.class);
-        order.setEntId(LoginUserHolder.getEntId()).setTOrderNo(getOrderNo())
-                .setUnit(param.getGoodsInfo().getUnit()).setSource(OrderSourceEnum.SALE.getType());
+        order.setEntId(LoginUserHolder.getEntId())
+                .setTOrderNo(getOrderNo())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
+                .setUnit(param.getGoodsInfo().getUnit())
+                .setSource(OrderSourceEnum.SALE.getType());
         String contractStatus = contract.getContractStatus();
         if (Objects.equals(contractStatus, ContractStatusEnum.WAIT_SIGNED.getCode())) {
             order.setStatus(OrderStatusEnum.WAIT_SIGNED.getCode());
@@ -769,7 +782,9 @@ public class KwoTradeOrderService {
         }
         order.setAmount(param.getAmount()).setUnit(Objects.isNull(param.getGoodsInfo()) ? null : param.getGoodsInfo().getUnit())
                 .setPrice(param.getPrice()).setTrading(param.getTrading()).setPickupType(param.getPickupType())
-                .setDeliveryType(param.getDeliveryType()).setStartTime(param.getStartTime()).setEndTime(param.getEndTime())
+                .setDeliveryType(param.getDeliveryType())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setRemark(param.getRemark());
         LambdaUpdateWrapper<KwoTradeOrder> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(KwoTradeOrder::getAmount, order.getAmount())
@@ -961,6 +976,8 @@ public class KwoTradeOrderService {
         } else {
             throw new BusinessException("Invalid contract status");
         }
+        order.setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()));
         kwoTradeOrderMapper.updateById(order);
         //更新商品价格
         kwoTradeOrderGoodsService.updateUnitPrice(param.getId(), param.getUnitPrice());
@@ -983,6 +1000,8 @@ public class KwoTradeOrderService {
         SckwTradeOrder updateParam = BeanUtils.copyProperties(param, SckwTradeOrder.class);
         updateParam.setTOrderId(param.getId())
                 .setStatus(order.getStatus())
+                .setStartTime(DateUtils.localDateToDateStart(param.getStartTime()))
+                .setEndTime(DateUtils.localDateToDateEnd(param.getEndTime()))
                 .setPrice(order.getPrice().doubleValue())
                 .setAmount(order.getAmount().doubleValue())
                 .setUnitPrice(param.getUnitPrice().doubleValue())

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java

@@ -65,6 +65,7 @@ public class KwoTransportDemandService {
      */
     public void addDraft(AddTransportDemandDraftParam param) {
         KwoTransportDemand transportDemand = BeanUtils.copyProperties(param, KwoTransportDemand.class);
+        transportDemand.setDeadline(DateUtils.localDateToDateEnd(param.getDeadline()));
         transportDemand.setEntId(LoginUserHolder.getEntId()).setStatus(TransportDemandStatusEnum.SAVED.getCode());
         kwoTransportDemandMapper.insert(transportDemand);
     }
@@ -78,6 +79,7 @@ public class KwoTransportDemandService {
      */
     public void addShelves(AddTransportDemandParam param) {
         KwoTransportDemand transportDemand = BeanUtils.copyProperties(param, KwoTransportDemand.class);
+        transportDemand.setDeadline(DateUtils.localDateToDateEnd(param.getDeadline()));
         transportDemand.setEntId(LoginUserHolder.getEntId()).setStatus(TransportDemandStatusEnum.PUT_ON_SHELVES.getCode());
         kwoTransportDemandMapper.insert(transportDemand);
     }
@@ -152,7 +154,7 @@ public class KwoTransportDemandService {
                 .set(KwoTransportDemand::getTrading, param.getTrading())
                 .set(KwoTransportDemand::getPrice, param.getPrice())
                 .set(KwoTransportDemand::getAmount, param.getAmount())
-                .set(KwoTransportDemand::getDeadline, param.getDeadline())
+                .set(KwoTransportDemand::getDeadline, DateUtils.localDateToDateEnd(param.getDeadline()))
                 .set(KwoTransportDemand::getContacts, param.getContacts())
                 .set(KwoTransportDemand::getPhone, param.getPhone())
                 .set(KwoTransportDemand::getLoadAreaCode, param.getLoadAreaCode())
@@ -386,9 +388,9 @@ public class KwoTransportDemandService {
                     .setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
                     .setLoadAddress(e.getLoadAreaName() + e.getLoadDetailAddress()).setSerialNumber(String.valueOf(i.getAndIncrement()))
                     .setUnloadAddress(e.getUnloadAreaName() + e.getUnloadDetailAddress())
-                    .setDeadline(Objects.isNull(e.getDeadline()) ? null : DateUtil.dateToStr(e.getDeadline()))
-                    .setCreateTime(Objects.isNull(e.getCreateTime()) ? null : DateUtil.getDateTime(e.getCreateTime()))
-                    .setUpdateTime(Objects.isNull(e.getUpdateTime()) ? null : DateUtil.getDateTime(e.getUpdateTime()))
+                    .setDeadline(Objects.isNull(e.getDeadline()) ? null : DateUtils.format(e.getDeadline(), DateUtils.DATE_PATTERN))
+                    .setCreateTime(DateUtil.getDateTime(e.getCreateTime()))
+                    .setUpdateTime(DateUtil.getDateTime(e.getUpdateTime()))
                     .setEntName(entMap.get(e.getEntId()));
             result.add(export);
         });

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -7,6 +7,7 @@ import com.sckw.core.model.vo.TableStatisticRes;
 import com.sckw.core.model.vo.TableTop;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.DateUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.excel.utils.DateUtil;
@@ -470,8 +471,8 @@ public class KwOrderService {
                     .setTrading(tradeMap.get(e.getTrading()))
                     .setLoadDetailAddressInfo(loadCityName + loadDetailAddress)
                     .setUnloadDetailAddressInfo(unloadCityName + unloadDetailAddress)
-                    .setStartTime(Objects.isNull(e.getStartTime()) ? null : DateUtil.dateToStr(e.getStartTime()))
-                    .setEndTime(Objects.isNull(e.getEndTime()) ? null : DateUtil.dateToStr(e.getEndTime()))
+                    .setStartTime(Objects.isNull(e.getStartTime()) ? null : DateUtils.format(e.getStartTime(), DateUtils.DATE_PATTERN))
+                    .setEndTime(Objects.isNull(e.getEndTime()) ? null : DateUtils.format(e.getEndTime(), DateUtils.DATE_PATTERN))
                     .setCreateTime(DateUtil.getDateTime(e.getCreateTime()));
             list.add(export);
         });