blame | history | patch | commit | commitdiff | ignore whitespace
Helius
2020-12-27 02b99a09475f5b4497a7864635d196a301d4ba71 
 zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java


@@ -1,17 +1,33 @@


package com.matrix.system.app.action;




import com.matrix.core.constance.MatrixConstance;


import com.matrix.core.pojo.AjaxResult;


import com.matrix.core.tools.DateUtil;


import com.matrix.core.tools.WebUtil;


import com.matrix.system.app.dto.BeauticianDto;


import com.matrix.system.app.mapper.SysBeauticianStateMapper;


import com.matrix.system.app.mapper.SysUsersMapper;


import com.matrix.system.app.mapper.SysWorkBeatuistaffMapper;


import com.matrix.system.app.vo.BeauticianVo;


import com.matrix.system.app.vo.UserAchieveVo;


import com.matrix.system.common.bean.SysUsers;


import com.matrix.system.common.service.SysUsersService;


import com.matrix.system.hive.bean.SysBeauticianState;


import com.matrix.system.hive.bean.SysWorkBeatuistaff;


import com.matrix.system.hive.service.AchieveNewService;


import com.matrix.system.hive.service.SysWorkBeatuistaffService;


import com.matrix.system.hive.service.SysWorktimeService;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.ApiResponse;


import io.swagger.annotations.ApiResponses;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.util.ArrayList;


import java.util.List;




/**


 * @author wzy


@@ -25,8 +41,17 @@


    @Autowired


    private AchieveNewService achieveNewService;




    @Autowired


    private SysWorktimeService sysWorkTimeService;




    @ApiOperation(value = "获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")


    @Autowired


    private SysUsersService sysUsersService;




    @Autowired


    private SysWorkBeatuistaffService sysWorkBeatuistaffService;






    @ApiOperation(value = "个人中心--获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")


    @ApiResponses({


            @ApiResponse(code = 200, message = "ok", response = UserAchieveVo.class)


    })


@@ -38,5 +63,30 @@


        return ajaxResult;


    }




    @ApiOperation(value = "获取美疗师列表 - 开始时间结束时间")


    @ApiResponses(


            @ApiResponse(code = 200, message = "Ok", response = BeauticianVo.class)


    )


    @PostMapping(value = "/findBeauticianList")


    public AjaxResult findBeauticianList(@RequestBody @Validated BeauticianDto beauticianDto) {


//        SysBeauticianState sysBeauticianState = new SysBeauticianState();


//        sysBeauticianState.setBeginTime(beauticianDto.getStartTime());


//        sysBeauticianState.setEndTime(beauticianDto.getEndTime());


//


//        // 根据时间获取一段排班码


//        String panBanCodes = DateUtil.dateToString(sysBeauticianState.getBeginTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);


//        // 获取登陆的用户


//        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);


//        List<SysUsers> staffs=new ArrayList<>();


//        if(sysWorkTimeService.isInWorkTime(user.getShopId(),sysBeauticianState.getBeginTime(),sysBeauticianState.getEndTime())){


//            staffs= sysUsersService.findByCodeBeaStateShop(user.getShopId(),


//                    sysBeauticianState, panBanCodes);


//        }




        SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);


        String panBanCodes = DateUtil.dateToString(beauticianDto.getStartTime(),DateUtil.DATE_FORMAT_NO_SPLITE_DD);


        List<SysWorkBeatuistaff> workBeauty = sysWorkBeatuistaffService.findByDateStr(panBanCodes, user.getShopId());


        return new AjaxResult(AjaxResult.STATUS_SUCCESS, SysWorkBeatuistaffMapper.INSTANCE.workBeautysToBeautyVos(workBeauty), 0);


    }




}