From 583fc7b7ed2ab5961c50e24e779262f168b9d55f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:46:39 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 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 4b2abba..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
@@ -1,24 +1,24 @@
package com.matrix.system.padApi.action;
import cn.hutool.core.collection.CollUtil;
-import com.matrix.core.constance.MatrixConstance;
+import cn.hutool.core.util.ObjectUtil;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.DateUtil;
+import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.RSAUtils;
import com.matrix.core.tools.UUIDUtil;
-import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.vo.UserInfoVo;
import com.matrix.system.common.authority.DefaultAuthorityManager;
import com.matrix.system.common.authority.strategy.AccountPasswordLogin;
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.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;
@@ -123,10 +123,15 @@
return result;
}
+ @Autowired
+ private SysUsersDao sysUsersDao;
+
@ApiOperation(value = "首页", notes = "首页")
- @GetMapping(value = "/frist")
- public AjaxResult frist() {
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ @GetMapping(value = "/frist/{suId}")
+ public AjaxResult frist(@PathVariable Long suId) {
+ SysUsers user = usersService.findById(suId);
+ LogUtil.info("首页 shopId={}", user.getShopId());
+// SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
PadOrderListDto orderListDto = new PadOrderListDto();
orderListDto.setPageNum(1);
orderListDto.setPageSize(5);
@@ -135,24 +140,37 @@
PaginationVO pageVo = new PaginationVO();
pageVo.setOffset(offset);
pageVo.setLimit(limit);
-// if (!DataAuthUtil.hasAllShopAuth()) {
+ if(ObjectUtil.isNotEmpty(user.getShopId())){
orderListDto.setShopId(user.getShopId());
+ }
+// if (!DataAuthUtil.hasAllShopAuth()) {
+// orderListDto.setShopId(user.getShopId());
// }
- QueryUtil.setQueryLimitCom(orderListDto);
+
+ if(ObjectUtil.isNotEmpty(user.getCompanyId())){
+ orderListDto.setCompanyId(user.getCompanyId());
+ }
+// 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)){
@@ -162,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