Procházet zdrojové kódy

筛选不到数据的问题。

xucaiqin před 1 týdnem
rodič
revize
2adfb78869

+ 2 - 4
sckw-modules/sckw-report/src/main/java/com/sckw/report/model/dto/SalesReportDTO.java

@@ -3,8 +3,6 @@ package com.sckw.report.model.dto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.util.Date;
-
 @Data
 @Schema(description = "销售报表筛选参数")
 public class SalesReportDTO {
@@ -25,11 +23,11 @@ public class SalesReportDTO {
      * 开始时间
      */
     @Schema(description = "开始时间")
-    private Date startTime;
+    private String startTime;
 
     /**
      * 结束时间
      */
     @Schema(description = "结束时间")
-    private Date endTime;
+    private String endTime;
 }

+ 5 - 4
sckw-modules/sckw-report/src/main/java/com/sckw/report/service/impl/KwSalesReportServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sckw.report.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.sckw.contract.api.feign.SalesReportContractFeignService;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.constant.Global;
@@ -54,11 +55,11 @@ public class KwSalesReportServiceImpl implements KwSalesReportService {
         queryDto.setGoodsId(salesReportDTO.getGoodsId());
 
         // 转换时间格式:Date转String yyyy-MM-dd
-        if (salesReportDTO.getStartTime() != null) {
-            queryDto.setStartTime(sdf.format(salesReportDTO.getStartTime()));
+        if (StrUtil.isNotBlank(salesReportDTO.getStartTime())) {
+            queryDto.setStartTime(salesReportDTO.getStartTime() + " 00:00:00");
         }
-        if (salesReportDTO.getEndTime() != null) {
-            queryDto.setEndTime(sdf.format(salesReportDTO.getEndTime()));
+        if (StrUtil.isNotBlank(salesReportDTO.getEndTime())) {
+            queryDto.setEndTime(salesReportDTO.getEndTime() + " 23:59:59");
         }
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
         Map<String, String> nameMap, specMap;