From 2c2413760b6467bf62402dba7338bd3bbcbd7341 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 20 五月 2025 14:20:38 +0800
Subject: [PATCH] 添加产量报表功能页面
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 0ad7442..e2c2fc4 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
@@ -74,7 +74,7 @@
@PostMapping("/findDayNotCompleteOutput")
@ResponseBody
public Result findDayNotCompleteOutput(@RequestBody Map<String, String> map) {
- int dayCount=0-Integer.valueOf(map.get("dayCount").toString());
+ int dayCount=1-Integer.valueOf(map.get("dayCount").toString());
Calendar cal = Calendar.getInstance();
//璁剧疆褰撳墠鏃堕棿
cal.setTime(new Date());
@@ -84,8 +84,9 @@
cal.set(Calendar.MILLISECOND, 0);
cal.add(Calendar.DATE, dayCount);
QueryWrapper<KBBTJPDrawingBP> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("scan_id,(task_quantity-isNull(report_count,0)) as notComplete,isNull((length*width*(task_quantity-isNull(report_count,0)))/1000000,0) as area_sum").
- gt("CreateDate",cal.getTime()).apply("task_quantity>isNull(report_count,0)");
+ queryWrapper.select("OrderNo,(sum(task_quantity-isNull(report_count,0))) as notComplete,sum(isNull((length*width*(task_quantity-isNull(report_count,0)))/1000000,0)) as area_sum").
+ gt("PlanDate",cal.getTime()).having("sum(task_quantity-isNull(report_count,0))>0")
+ .groupBy("OrderNo");
List<Map> list=kBBTJPDrawingBPMapper.selectMaps((QueryWrapper)queryWrapper);
return Result.build(200,"鎴愬姛",list);
}
@@ -112,13 +113,13 @@
cal.set(Calendar.MINUTE, 0);
cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0);
- cal.add(Calendar.DATE, 0-dayCount);
+ cal.add(Calendar.DATE, 1-dayCount);
Date startDate = cal.getTime();
QueryWrapper<KBBTJPDrawingBP> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("CAST(CreateDate 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("CreateDate",startDate).groupBy("CAST(CreateDate AS DATE)")
- .orderByAsc("CAST(CreateDate AS DATE)");;
+ 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)")
+ .orderByAsc("CAST(PlanDate AS DATE)");;
List<Map> list=kBBTJPDrawingBPMapper.selectMaps((QueryWrapper)queryWrapper);
List<Map> resultDate=new ArrayList<>();
for (int i=0;i<dayCount;i++){
--
Gitblit v1.8.0