From 66a2bbaed29c6134b84e0916c96916a983bc64e8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 20 十月 2023 11:02:58 +0800
Subject: [PATCH] zjh 2023/10/20--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java
index 7ecc9f8..cf7a74d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSummaryController.java
@@ -1,5 +1,6 @@
package com.ltkj.web.controller.system;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.base.Joiner;
import com.ltkj.common.core.domain.AjaxResult;
@@ -80,7 +81,7 @@
wqq.between(TjTollCollector::getCreateTime, accountBeginTime, accountEndTime);
}
wqq.orderByDesc(TjTollCollector::getCreateTime);
- wqq.eq(TjTollCollector::getIsHz,"N");
+ wqq.isNull(TjTollCollector::getIsHz);
List<TjTollCollector> list= collectorService.list(wqq);
return AjaxResult.success(list);
}
@@ -102,7 +103,7 @@
zshoukuan=zshoukuan.add(collector.getAmountReceived());
ztuikuan=ztuikuan.add(collector.getRefundAmount());
zyingjiao=zyingjiao.add(collector.getPayable());
- collector.setIsHz("Y");
+ collector.setIsHz(accountId);
collectorService.updateById(collector);
}
}
@@ -138,7 +139,7 @@
String[] split = accountId.split(";");
for (String s : split) {
TjTollCollector tollCollector = collectorService.getTjTollCollectorById(s);
- tollCollector.setIsHz("N");
+ tollCollector.setIsHz(null);
collectorService.updateById(tollCollector);
}
return AjaxResult.success("璇ヨ处鍗曞凡鎴愬姛鎾ら攢");
@@ -156,4 +157,17 @@
return AjaxResult.success(printSetUp);
}
+
+ @GetMapping("/getLastTime")
+ @ApiOperation(value = "鑾峰彇姹囨�绘椂闂磋捣濮嬫椂闂�")
+ public AjaxResult getLastTime() {
+ LambdaQueryWrapper<TjSummary> wq = new LambdaQueryWrapper<>();
+ wq.orderByDesc(TjSummary::getCreateTime);
+ List<TjSummary> list = summaryService.list(wq);
+ if (null != list && list.size() > 0) return AjaxResult.success(list.get(0).getCreateTime());
+ String dateStr = "2023-10-01 00:00:00";
+ Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH:mm:ss");
+ return AjaxResult.success(date);
+ }
+
}
--
Gitblit v1.8.0