lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 07:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改对账逻辑

Browse Source
This commit is contained in:
lihongjie0209
2024-10-10 13:50:22 +08:00
parent c36a352bbf
commit 8e0c99ae9b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/lihongjie/coal/weightDeviceData/service/WeightDeviceDataService.java
View File

@@ -513,11 +513,11 @@ where 二次过磅时间>='%s' and 二次过磅时间<='%s'
String where = "where 1 = 1 ";
if (request.getStartTime() != null) {
where += " and d.mz_time >= :startTime ";
where += " and d.ecgb_time >= :startTime ";
}
if (request.getEndTime() != null) {
where += " and d.mz_time <= :endTime ";
where += " and d.ecgb_time <= :endTime ";
}
if (StringUtils.isNotEmpty(request.getPlateNo())) {
@@ -578,7 +578,7 @@ where 二次过磅时间>='%s' and 二次过磅时间<='%s'
var sql =
"select DATE_TRUNC('"
+ request.getTimeDimension()
+ "', d.mz_time) as time,\n"
+ "', d.ecgb_time) as time,\n"
+ groupSql
+ ",\n"
+ fieldSql
@@ -590,7 +590,7 @@ where 二次过磅时间>='%s' and 二次过磅时间<='%s'
+ "\n"
+ "group by DATE_TRUNC('"
+ request.getTimeDimension()
+ "', d.mz_time), "
+ "', d.ecgb_time), "
+ groupSql
+ "\n"
+ "order by time desc ";