20220505

xiaoyong931011

2022-05-05 3b3f13a66fe018b1f0abe16db8d194b1927907aa

 zq-erp/src/main/java/com/matrix/system/padApi/action/PadApiCommonAction.java

@@ -24,6 +24,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 +77,12 @@
    @Resource
    private SysWorktimeService sysWorkTimeService;

    @Resource
    private SysUsersService usersService;

    @Autowired
    private SysBedInfoDao sysBedInfoDao;

    @Value("${login_public_key}")
    private String publicKey;

@@ -117,10 +124,6 @@
        return result;
    }


    @Resource
    private SysUsersService usersService;

    @ApiOperation(value = "首页", notes = "首页")
    @GetMapping(value = "/frist")
    public AjaxResult frist() {
@@ -142,10 +145,10 @@
        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 +172,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);