From e37740bcaa6a0dfdef6e082e4d8136b81d453000 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 09 七月 2024 18:16:48 +0800
Subject: [PATCH] zjh 2024/07/9-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
index ba25dab..a9503b5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java
@@ -609,7 +609,12 @@
public Integer ToBeToday() {
//褰撳墠鏃ユ湡鎷兼帴寮�濮嬪拰缁撴潫鏃堕棿
//鏃堕棿瀛楃涓茬被鍨嬭浆鎹㈡椂闂寸被鍨�
- return orderService.count(new QueryWrapper<TjOrder>().between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())).eq("check_status", 0));
+ return orderService.count(new QueryWrapper<TjOrder>()
+ .between("create_time", DateUtil.beginOfDay(new Date()),
+ DateUtil.endOfDay(new Date()))
+ .isNotNull("finish_time")
+ .eq("check_status", 0)
+ .ne("tj_category","13"));
}
/**
@@ -622,7 +627,10 @@
public Integer checkedToday() {
//褰撳墠鏃ユ湡鎷兼帴寮�濮嬪拰缁撴潫鏃堕棿
//鏃堕棿瀛楃涓茬被鍨嬭浆鎹㈡椂闂寸被鍨�
- return orderService.count(new QueryWrapper<TjOrder>().isNotNull("finish_time").between("finish_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
+ return orderService.count(new QueryWrapper<TjOrder>()
+ .isNotNull("finish_time")
+ .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()))
+ .last("and (check_status=1 OR tj_category=13)"));
}
/**
@@ -633,7 +641,9 @@
public Integer ReportToday() {
//褰撳墠鏃ユ湡鎷兼帴寮�濮嬪拰缁撴潫鏃堕棿
//鏃堕棿瀛楃涓茬被鍨嬭浆鎹㈡椂闂寸被鍨�
- return orderService.count(new QueryWrapper<TjOrder>().isNotNull("report_time").between("report_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
+ return orderService.count(new QueryWrapper<TjOrder>()
+ .isNotNull("report_time")
+ .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
}
/**
@@ -644,7 +654,8 @@
@GetMapping("/registerToday")
@ApiOperation(value = "鏌ヨ浠婃棩鐧昏")
public Integer RegisterToday() {
- return orderService.count(new QueryWrapper<TjOrder>().between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
+ return orderService.count(new QueryWrapper<TjOrder>()
+ .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
}
@@ -719,13 +730,14 @@
Integer tuan=0;
BigDecimal shouyi=new BigDecimal(0);
for (TjOrder tjOrder : list) {
- final TjCustomer byId = customerService.getById(tjOrder.getUserId());
- if (byId.getCusSex()==0){
- boys+=1;
- }else if (byId.getCusSex()==1){
- girls+=1;
+ TjCustomer customer = customerService.getById(tjOrder.getUserId());
+ if(null !=customer){
+ if (customer.getCusSex()==0){
+ boys+=1;
+ }else if (customer.getCusSex()==1){
+ girls+=1;
+ }
}
-
if ("2".equals(tjOrder.getTjType())){
person+=1;
} else if ("1".equals(tjOrder.getTjType())) {
@@ -736,7 +748,10 @@
wqqq.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqqq);
for (TjFlowingWater tjFlowingWater : list1) {
- shouyi.add(tjFlowingWater.getPaidIn());
+ if(null !=tjFlowingWater.getPaidIn()){
+ shouyi.add(tjFlowingWater.getPaidIn());
+ }
+
}
}
chartVo.setBoysNum(boys);
--
Gitblit v1.8.0