From e206ea8f7dbb655c0d8868996dae8ff1ff5ed11a Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 12 六月 2025 16:41:19 +0800
Subject: [PATCH] 修改看板大屏，动态获取数据
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
index e2c2fc4..2076533 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
@@ -2,12 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mes.md.entity.*;
+import com.mes.md.entity.KBBTJPDrawingBP;
+import com.mes.md.entity.PrimitiveTask;
import com.mes.md.mapper.KBBTJPDrawingBPMapper;
import com.mes.md.service.KBBTJPDrawingBPService;
import com.mes.md.service.PrimitiveTaskService;
import com.mes.md.service.TaskingLogService;
-import com.mes.md.service.TaskingService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -104,8 +104,8 @@
@ApiOperation("鏌ヨ 璁″垝閲� m虏 鐗囨暟锛堝鎴疯〃锛�")
@PostMapping("/findPlannedQuantity")
@ResponseBody
- public Result findPlannedQuantity(@RequestBody Map<String, String> map) {
- int dayCount=Integer.valueOf(map.get("dayCount").toString());
+ public Result findPlannedQuantity() {
+ //int dayCount=Integer.valueOf(map.get("dayCount").toString());
Calendar cal = Calendar.getInstance();
//璁剧疆褰撳墠鏃堕棿
cal.setTime(new Date());
@@ -113,15 +113,30 @@
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
- cal.add(Calendar.DATE, 1-dayCount);
+
+ //cal.add(Calendar.DATE, 1-dayCount);
+ cal.set(Calendar.DAY_OF_MONTH, 1);
Date startDate = cal.getTime();
+
+ // 鑾峰彇褰撴湀鏈�鍚庝竴澶�
+ Calendar lastDayCal = (Calendar) cal.clone();
+ lastDayCal.add(Calendar.MONTH, 1);
+ lastDayCal.add(Calendar.DATE, -1);
+ Date endDate = lastDayCal.getTime();
+
+ // 鑾峰彇褰撴湀澶╂暟
+ int dayCount = lastDayCal.get(Calendar.DAY_OF_MONTH);
QueryWrapper<KBBTJPDrawingBP> queryWrapper = new QueryWrapper<>();
queryWrapper.select("CAST(PlanDate AS DATE) AS CreateDate,isNull(sum(task_quantity),0) as task_quantity_sum,isNull(sum(length*width*task_quantity)/1000000,0) as area_sum")
- .gt("PlanDate",startDate).groupBy("CAST(PlanDate AS DATE)")
+ .ge("PlanDate",startDate).le("PlanDate",endDate).groupBy("CAST(PlanDate AS DATE)")
.orderByAsc("CAST(PlanDate AS DATE)");;
List<Map> list=kBBTJPDrawingBPMapper.selectMaps((QueryWrapper)queryWrapper);
List<Map> resultDate=new ArrayList<>();
+
+ // 閲嶇疆鏃ュ巻鍒板綋鏈堢涓�澶�
+ cal.setTime(startDate);
+
for (int i=0;i<dayCount;i++){
Date thisdate=cal.getTime();
cal.add(Calendar.DATE, 1);
--
Gitblit v1.8.0