From 773870f014c9e05c806101069c651da99b00ddda Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十一月 2024 14:13:20 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 554c9fe..f4dfa03 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -40,6 +40,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
@@ -540,17 +541,24 @@
public List<TransportMeasureVO> transportMeasure(Integer queryType){
List<TransportMeasureVO> list = new ArrayList<>();
Random random = new Random();
- List<String> dayList = DateUtil.getBeforDays(new Date(),7);
+ List<Date> dayList = DateUtil.getDateListBeforDays(new Date(),7);//杩�7澶�
if(Constants.equalsInteger(queryType,Constants.ONE)){
- dayList = DateUtil.getBeforDays(new Date(),30);
+ dayList = DateUtil.getThisMonthDateList();//鏈湀澶╂暟
}else if(Constants.equalsInteger(queryType,Constants.TWO)){
- dayList = DateUtil.getBeforMonth(new Date(),12);
+ dayList = DateUtil.getThisYearMonthList();//鏈勾鏈堜唤
}
-
-
- for (String str:dayList) {
+ List<PlatformJob> dataList = platformJobMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",PlatformJob::getIoQty)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .apply(queryType==0,"to_days(create_date) >= to_days(now()) -7")
+ .apply(queryType==1,"year(create_date) = year(now()) and month(create_date) = month(now())")
+ .apply(queryType==2,"year(create_date) = year(now())"));
+ for (Date date : dayList) {
TransportMeasureVO data = new TransportMeasureVO();
- data.setPlanDate(str);
+ data.setPlanDate(date);
data.setPlanTimes(random.nextInt(200));
data.setPlanTaskNum(new BigDecimal(random.nextInt(1000)));
data.setFinishTaskNum(new BigDecimal(data.getPlanTaskNum().intValue()));
--
Gitblit v1.9.3