From 75d7170299c7feb214ffa7551da2212e916df9d4 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 25 四月 2025 17:24:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingOverviewServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingOverviewServiceImpl.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingOverviewServiceImpl.java
index 8755fab..c9041ca 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingOverviewServiceImpl.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingOverviewServiceImpl.java
@@ -32,19 +32,19 @@
}
String clock = (String) params.get("clock");
- String monthEndClock;
+ String monthStartClock;
if (StringUtils.isBlank(clock)) {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_YEAR, -1);
clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
calendar.add(Calendar.DAY_OF_YEAR, -30);
- monthEndClock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
+ monthStartClock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
}else {
Date parse = DateUtils.parse(clock, "yyyy-MM-dd");
Calendar c = Calendar.getInstance();
c.setTime(parse);
c.add(Calendar.DAY_OF_YEAR, -29);
- monthEndClock = DateUtils.format(c.getTime(), "yyyy-MM-dd");
+ monthStartClock= DateUtils.format(c.getTime(), "yyyy-MM-dd");
}
// 天数据
@@ -63,7 +63,7 @@
// 月数据
QueryWrapper<CokingOverviewEntity> queryWrapperMonth = new QueryWrapper<>();
queryWrapperMonth.eq("process_type", processType);
- queryWrapperMonth.between("clock", clock,monthEndClock);
+ queryWrapperMonth.between("clock", monthStartClock,clock);
queryWrapperMonth.select("sub_process_type","SUM(steam_p) as steam_p","SUM(dj_steam_p) as dj_steam_p","SUM(steam_c) as steam_c","SUM(steam_only_c) as steam_only_c","SUM(steam_v) as steam_v","SUM(gas_p) as gas_p","SUM(gas_c) as gas_c","SUM(power_c) as power_c","SUM(power_only_c) as power_only_c","SUM(power_c_standard) as power_c_standard","SUM(idle_time) as idle_time","SUM(bfg_c) as bfg_c","SUM(cog_p) as cog_p","SUM(cog_c) as cog_c","SUM(bfg_only_c) as bfg_only_c","SUM(cog_only_c) as cog_only_c","SUM(gxls) as gxls","SUM(fg_ratio) as fg_ratio")
.groupBy("sub_process_type");
--
Gitblit v1.9.3