From 2b342f7e59629275c8bed32e14de8eadd16b03b4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:07:00 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 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 35d8a16..04dd9aa 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
@@ -14,12 +14,11 @@
import com.matrix.system.common.authority.strategy.LoginStrategy;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.SysCompanyDao;
+import com.matrix.system.common.dao.SysUsersDao;
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;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysBedInfo;
import com.matrix.system.hive.bean.SysProjServices;
@@ -124,6 +123,9 @@
return result;
}
+ @Autowired
+ private SysUsersDao sysUsersDao;
+
@ApiOperation(value = "首页", notes = "首页")
@GetMapping(value = "/frist/{suId}")
public AjaxResult frist(@PathVariable Long suId) {
@@ -141,24 +143,34 @@
if(ObjectUtil.isNotEmpty(user.getShopId())){
orderListDto.setShopId(user.getShopId());
}
- if (!DataAuthUtil.hasAllShopAuth()) {
- orderListDto.setShopId(user.getShopId());
+// if (!DataAuthUtil.hasAllShopAuth()) {
+// orderListDto.setShopId(user.getShopId());
+// }
+
+ if(ObjectUtil.isNotEmpty(user.getCompanyId())){
+ orderListDto.setCompanyId(user.getCompanyId());
}
- QueryUtil.setQueryLimitCom(orderListDto);
+// 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);
+ SysUsers shopstaffInfo = new SysUsers();
+ shopstaffInfo.setCompanyId(user.getCompanyId());
+ shopstaffInfo.setShopId(user.getShopId());
+ shopstaffInfo.setRoleName(Dictionary.STAFF_POST_MLS);
+ List<SysUsers> mls = sysUsersDao.selectByRoleName(shopstaffInfo);
+ LogUtil.info("美疗师 size={}", mls.size());
+// List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
if(CollUtil.isNotEmpty(mls)){
SysBeauticianState sysBeauticianState = new SysBeauticianState();
sysBeauticianState.setBeginTime(DateUtil.getStartDate(date));
sysBeauticianState.setEndTime(DateUtil.getStartDate(date));
String panBanCodes = DateUtil.dateToString(sysBeauticianState.getBeginTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);
List<SysUsers> staffs=new ArrayList<>();
- if(sysWorkTimeService.isInWorkTime(user.getShopId(),sysBeauticianState.getBeginTime(),sysBeauticianState.getEndTime())){
+// if(sysWorkTimeService.isInWorkTime(user.getShopId(),sysBeauticianState.getBeginTime(),sysBeauticianState.getEndTime())){
staffs= sysUsersService.findByCodeBeaStateShop(user.getShopId(),
sysBeauticianState, panBanCodes);
if(CollUtil.isNotEmpty(staffs)){
@@ -168,15 +180,15 @@
result.putInMap("usedMls", mls.size());
result.putInMap("freeMls", 0);
}
- }
+// }
}
SysBedInfo bedInfo = new SysBedInfo();
- bedInfo.setShopId(getMe().getShopId());
+ bedInfo.setShopId(user.getShopId());
List<SysBedInfo> totalBed = bedInfoService.findByModel(bedInfo);
if(CollUtil.isNotEmpty(totalBed)){
SysProjServices sysProjServices = new SysProjServices();
- sysProjServices.setShopId(getMe().getShopId());
+ sysProjServices.setShopId(user.getShopId());
sysProjServices.setStartTime(DateUtil.getStartDate(date));
sysProjServices.setEndTime(DateUtil.getStartDate(date));
--
Gitblit v1.9.1