|
@@ -1,6 +1,7 @@
|
|
|
package com.sckw.report.service.impl;
|
|
package com.sckw.report.service.impl;
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.sckw.contract.api.feign.SalesReportContractFeignService;
|
|
import com.sckw.contract.api.feign.SalesReportContractFeignService;
|
|
|
import com.sckw.core.common.enums.enums.DictTypeEnum;
|
|
import com.sckw.core.common.enums.enums.DictTypeEnum;
|
|
|
import com.sckw.core.model.constant.Global;
|
|
import com.sckw.core.model.constant.Global;
|
|
@@ -54,11 +55,11 @@ public class KwSalesReportServiceImpl implements KwSalesReportService {
|
|
|
queryDto.setGoodsId(salesReportDTO.getGoodsId());
|
|
queryDto.setGoodsId(salesReportDTO.getGoodsId());
|
|
|
|
|
|
|
|
// 转换时间格式:Date转String yyyy-MM-dd
|
|
// 转换时间格式: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, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
|
|
|
Map<String, String> nameMap, specMap;
|
|
Map<String, String> nameMap, specMap;
|