From 4d1cc2fd7553f3c648da150971cd4a87c282f5ad Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 17 十月 2023 09:06:44 +0800
Subject: [PATCH] zjh 2023/10/17--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
index 0468706..352c776 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjTollCollectorController.java
@@ -14,7 +14,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.ChargeStatisticsVo;
@@ -80,7 +82,6 @@
if (null != accountBeginTime && null != accountEndTime) {
wqq.between(TjTollCollector::getCreateTime, accountBeginTime, accountEndTime);
} else {
- DateTime dateTime = DateUtil.lastWeek();
wqq.between(TjTollCollector::getCreateTime, DateUtil.lastWeek(),DateUtil.date());
}
wqq.orderByDesc(TjTollCollector::getCreateTime);
@@ -175,6 +176,9 @@
// TjTollCollector collector = tjTollCollectorService.getById(id);
TjTollCollector collector = tjTollCollectorService.getTjTollCollectorById(id);
if (null != collector) {
+ if("Y".equals(collector.getIsHz())){
+ return AjaxResult.error("璇ヨ处鍗曞凡姹囨�讳笉鍙挙閿�");
+ }
LambdaQueryWrapper<TjTollCollectorDetail> wq = new LambdaQueryWrapper<>();
wq.eq(TjTollCollectorDetail::getAccountId, collector.getAccountId());
collectorDetailService.remove(wq);
@@ -207,7 +211,9 @@
wq.orderByDesc(TjTollCollector::getAccountEndTime);
List<TjTollCollector> list = tjTollCollectorService.list(wq);
if (null != list && list.size() > 0) return success(list.get(0).getAccountEndTime());
- return AjaxResult.success("1970-01-01 00:00:00");
+ String dateStr = "1970-01-01 00:00:00";
+ Date date = DateUtil.parse(dateStr, "yyyy-MM-dd HH:mm:ss");
+ return AjaxResult.success(date);
}
@@ -243,7 +249,7 @@
List<Map<String, Object>> cc = new ArrayList<>();
//缁熻鎬婚泦鍚�
//浠樻鏂瑰紡
- Map<Long, List<TjFlowingWater>> m = list.stream().collect(Collectors.groupingBy(TjFlowingWater::getPayType));
+ Map<Long, List<TjFlowingWater>> m = list.stream().filter(item-> StringUtils.isNotNull(item.getPayType())).collect(Collectors.groupingBy(TjFlowingWater::getPayType));
BigDecimal zshoukuan = new BigDecimal("0.00");
BigDecimal ztuikuan = new BigDecimal("0.00");
BigDecimal zyingjiao = new BigDecimal("0.00");
--
Gitblit v1.8.0