From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
index bbeabee..b399317 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
@@ -2,9 +2,8 @@
import com.alibaba.fastjson.JSONObject;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.join.BookingsJoinMapper;
import com.doumee.dao.business.join.RoomsJoinMapper;
@@ -15,7 +14,6 @@
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -23,7 +21,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -60,7 +57,7 @@
bookquery.eq(Bookings::getIsdeleted, Constants.ZERO);
bookquery.eq(Bookings::getStatus, Constants.ZERO);
bookquery.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') " );
- Integer todayBookingsNum= bookingsJoinMapper.selectCount(bookquery);
+ Long todayBookingsNum= bookingsJoinMapper.selectCount(bookquery);
json.put("todayBookingsNum",todayBookingsNum);
//浠婃棩浼氳鏃堕暱锛堝皬鏃讹級
@@ -83,7 +80,7 @@
bq2.eq(Bookings::getStatus, Constants.ZERO);
bq2.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') " );
// bq2.last("limit 1");
- bq2.select("(select count(u.id) from user_rel u where u.ISDELETED=0 and u.OBJ_ID=t.id)as bookingUser");
+ bq2.select("(select count(u.id) from meeting_user_rel u where u.ISDELETED=0 and u.OBJ_ID=t.id)as bookingUser");
List<Bookings> bk2= bookingsJoinMapper.selectJoinList(Bookings.class,bq2);
Integer bookingUser=0;
@@ -136,7 +133,7 @@
MPJLambdaWrapper<Rooms> rm1 = new MPJLambdaWrapper<>();
rm1.eq(Rooms::getIsdeleted, Constants.ZERO);
rm1.eq(Rooms::getStatus, Constants.ZERO);
- Integer roomNum= roomsJoinMapper.selectCount(rm1);
+ Long roomNum= roomsJoinMapper.selectCount(rm1);
json.put("roomNum",roomNum);
//鍛樺伐鏁伴噺
--
Gitblit v1.9.3