From 0ac5bdd7425f8366d63c16b42a4f563984c1db97 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Dec 2020 16:39:32 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
index 36a6899..2f035da 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -1,17 +1,30 @@
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.SysUsersMapper;
+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.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
@@ -24,9 +37,13 @@
@Autowired
private AchieveNewService achieveNewService;
+ @Resource
+ private SysWorktimeService sysWorkTimeService;
+ @Resource
+ private SysUsersService sysUsersService;
- @ApiOperation(value = "获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")
+ @ApiOperation(value = "个人中心--获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")
@ApiResponses({
@ApiResponse(code = 200, message = "ok", response = UserAchieveVo.class)
})
@@ -38,5 +55,27 @@
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);
+ }
+
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, SysUsersMapper.INSTANCE.usersListToBeautyList(staffs), 0);
+ }
}
--
Gitblit v1.9.1