From 81aee35c43bf9843b5bb3fc3c30ad34f2df89278 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期五, 25 四月 2025 15:58:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/service/impl/CokingOverviewServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 ea2c4c6..8755fab 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,15 +32,19 @@
}
String clock = (String) params.get("clock");
- String month;
+ String monthEndClock;
if (StringUtils.isBlank(clock)) {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_YEAR, -1);
clock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
- month = DateUtils.format(calendar.getTime(), "yyyy-MM");
+ calendar.add(Calendar.DAY_OF_YEAR, -30);
+ monthEndClock = DateUtils.format(calendar.getTime(), "yyyy-MM-dd");
}else {
Date parse = DateUtils.parse(clock, "yyyy-MM-dd");
- month = DateUtils.format(parse, "yyyy-MM");
+ Calendar c = Calendar.getInstance();
+ c.setTime(parse);
+ c.add(Calendar.DAY_OF_YEAR, -29);
+ monthEndClock = DateUtils.format(c.getTime(), "yyyy-MM-dd");
}
// 天数据
@@ -59,12 +63,12 @@
// 月数据
QueryWrapper<CokingOverviewEntity> queryWrapperMonth = new QueryWrapper<>();
queryWrapperMonth.eq("process_type", processType);
- queryWrapperMonth.like("clock", month);
- 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")
+ queryWrapperMonth.between("clock", clock,monthEndClock);
+ 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");
List<CokingOverviewEntity> monthList = cokingOverviewDao.selectList(queryWrapperMonth);
- monthList.forEach(e -> e.setClock(month));
+ monthList.forEach(e -> e.setClock("前30日累计"));
List<CokingOverviewDTO> monthDTOList = ConvertUtils.sourceToTarget(monthList, CokingOverviewDTO.class);
monthDTOList.forEach(e -> {
e.setProcessTypeName(processName);
--
Gitblit v1.9.3