20220505

xiaoyong931011

2022-05-05 9e4cf768d883ec93b3ac0d8aa63594c8bfb81962

 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,17 +143,26 @@
        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);
//        List<SysUsers> mls = usersService.findByRoleName(true, Dictionary.STAFF_POST_MLS);
        if(CollUtil.isNotEmpty(mls)){
            SysBeauticianState sysBeauticianState = new SysBeauticianState();
            sysBeauticianState.setBeginTime(DateUtil.getStartDate(date));
@@ -172,11 +183,11 @@
        }

        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));