From 6609c802315a497d918a47c247b2ef8973ddc980 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 31 Dec 2020 15:20:54 +0800
Subject: [PATCH] add all sysusers interface
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java | 8 ++
zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java | 15 +++++
zq-erp/src/main/java/com/matrix/system/app/dto/VipStatisticsParamDto.java | 100 +++++++++++++++++++++++++++++++++
3 files changed, 123 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
index 331a695..b632743 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java
@@ -5,6 +5,8 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.BusinessesDto;
+import com.matrix.system.app.dto.VipStatisticsParamDto;
+import com.matrix.system.app.vo.BeauticianVo;
import com.matrix.system.app.vo.BusinessesDataShowVo;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.action.util.QueryUtil;
@@ -178,4 +180,10 @@
return AjaxResult.buildSuccessInstance(tjVipSumDao.selectVipAchieveInPage(achieveNew, pageVo));
}
+ @ApiOperation(value = "员工专项", notes = "员工专项")
+ @PostMapping(value = "/findVipBusinessData")
+ public AjaxResult findVipBusinessData(@RequestBody @Validated VipStatisticsParamDto vipStatisticsParamDto) {
+ return null;
+ }
+
}
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 4474589..020ad65 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
@@ -104,4 +104,19 @@
return AjaxResult.buildSuccessInstance("退出成功");
}
+ @ApiOperation(value = "员工列表", notes = "员工列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = BeauticianVo.class)
+ })
+ @GetMapping(value = "/findAllUsers")
+ public AjaxResult findAllUsers() {
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+
+ SysUsers query = new SysUsers();
+ query.setCompanyId(sysUsers.getCompanyId());
+ List<SysUsers> list = sysUsersService.findByModel(query);
+ List<BeauticianVo> dataList = SysUsersMapper.INSTANCE.usersListToBeautyList(list);
+ return AjaxResult.buildSuccessInstance(dataList);
+ }
+
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/VipStatisticsParamDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/VipStatisticsParamDto.java
new file mode 100644
index 0000000..2f58a71
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/VipStatisticsParamDto.java
@@ -0,0 +1,100 @@
+package com.matrix.system.app.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 统计查询条件
+ * @author jyy
+ */
+@ApiModel(value = "VipStatisticsParamDto", description = "员工专项统计接收参数类")
+public class VipStatisticsParamDto {
+
+ public static final String COMPANY = "1";
+
+ public static final String SHOP = "2";
+
+ /**
+ * 开始时间
+ */
+ @NotBlank(message = "参数错误")
+ @ApiModelProperty(value = "开始时间", example = "2020-12-01")
+ private String beginTime;
+
+ /**
+ *结束时间
+ */
+ @NotBlank(message = "参数错误")
+ @ApiModelProperty(value = "结束时间", example = "2020-12-31")
+ private String endTime;
+ /**
+ *统计单位
+ */
+ @NotBlank(message = "参数错误")
+ @ApiModelProperty(value = "统计单位", example = "日")
+ private String statisticsUnit;
+
+ /**
+ *对比单位
+ */
+ @ApiModelProperty(hidden = true)
+ private String contrastUnit;
+ /**
+ * 门店id
+ */
+ @ApiModelProperty(value = "员工, 不传默认当前登陆用户")
+ private Long staffId;
+
+ @ApiModelProperty(value = "类型 1-订单业绩 2-现金业绩 3-售卡业绩 4-产品业绩 5-划扣业绩 6-本金消耗 7-赠送消耗 8-服务提成 9-人头数 10-项目数 11-服务时长", example = "1")
+ private String type;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getBeginTime() {
+ return beginTime;
+ }
+
+ public void setBeginTime(String beginTime) {
+ this.beginTime = beginTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getStatisticsUnit() {
+ return statisticsUnit;
+ }
+
+ public void setStatisticsUnit(String statisticsUnit) {
+ this.statisticsUnit = statisticsUnit;
+ }
+
+ public String getContrastUnit() {
+ return contrastUnit;
+ }
+
+ public void setContrastUnit(String contrastUnit) {
+ this.contrastUnit = contrastUnit;
+ }
+
+ public Long getStaffId() {
+ return staffId;
+ }
+
+ public void setStaffId(Long staffId) {
+ this.staffId = staffId;
+ }
+}
--
Gitblit v1.9.1