From 72e6562ca013e531862a461c2acee822983b03d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 05 May 2022 15:51:02 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
index caca5ae..4b2abba 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java
@@ -16,7 +16,6 @@
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.init.LocalCache;
import com.matrix.system.common.service.SysUsersService;
-import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.action.BaseController;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -24,6 +23,7 @@
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysShopInfo;
+import com.matrix.system.hive.dao.SysBedInfoDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.service.SysBedInfoService;
import com.matrix.system.hive.service.SysOrderService;
@@ -76,6 +76,12 @@
@Resource
private SysWorktimeService sysWorkTimeService;
+ @Resource
+ private SysUsersService usersService;
+
+ @Autowired
+ private SysBedInfoDao sysBedInfoDao;
+
@Value("${login_public_key}")
private String publicKey;
@@ -117,10 +123,6 @@
return result;
}
-
- @Resource
- private SysUsersService usersService;
-
@ApiOperation(value = "首页", notes = "首页")
@GetMapping(value = "/frist")
public AjaxResult frist() {
@@ -133,19 +135,19 @@
PaginationVO pageVo = new PaginationVO();
pageVo.setOffset(offset);
pageVo.setLimit(limit);
- if (!DataAuthUtil.hasAllShopAuth()) {
+// if (!DataAuthUtil.hasAllShopAuth()) {
orderListDto.setShopId(user.getShopId());
- }
+// }
QueryUtil.setQueryLimitCom(orderListDto);
List<PadOrderDetailVo> padApiOrderListInPage = sysOrderService.findPadApiOrderListInPage(orderListDto, pageVo);
AjaxResult result = AjaxResult.buildSuccessInstance("");
result.putInMap("orderList",padApiOrderListInPage);
+ Date date = new Date();
List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
if(CollUtil.isNotEmpty(mls)){
SysBeauticianState sysBeauticianState = new SysBeauticianState();
- Date date = new Date();
sysBeauticianState.setBeginTime(DateUtil.getStartDate(date));
sysBeauticianState.setEndTime(DateUtil.getStartDate(date));
String panBanCodes = DateUtil.dateToString(sysBeauticianState.getBeginTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
@@ -169,7 +171,11 @@
if(CollUtil.isNotEmpty(totalBed)){
SysProjServices sysProjServices = new SysProjServices();
sysProjServices.setShopId(getMe().getShopId());
- List<SysBedInfo> freeBed = bedInfoService.findFreeBed(sysProjServices);
+
+ sysProjServices.setStartTime(DateUtil.getStartDate(date));
+ sysProjServices.setEndTime(DateUtil.getStartDate(date));
+ List<SysBedInfo> freeBed = sysBedInfoDao.findFreeBed(sysProjServices);
+// List<SysBedInfo> freeBed = bedInfoService.findFreeBed(sysProjServices);
if(CollUtil.isNotEmpty(freeBed)){
result.putInMap("usedBed", totalBed.size() - freeBed.size());
result.putInMap("freeBed", freeBed);
--
Gitblit v1.9.1