From 58e25bcb2f0da4dd4b81b37d0bf6aa4f66f02361 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 28 Dec 2020 16:50:39 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java | 8 ++++ zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java | 13 ++++++ zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java | 36 ++++++++++++++++++ zq-erp/src/main/java/com/matrix/system/app/vo/RankingDto.java | 47 +++++++++++++++++++++++ 4 files changed, 104 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java new file mode 100644 index 0000000..0b7fba6 --- /dev/null +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java @@ -0,0 +1,36 @@ +package com.matrix.system.app.action; + +import com.matrix.core.pojo.AjaxResult; +import com.matrix.system.app.vo.RankingDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wzy + * @date 2020-12-28 + **/ +@Api(value = "ApiRankingAction", tags = "排行榜接口类") +@RestController +@RequestMapping(value ="/api/ranking") +public class ApiRankingAction { + + public AjaxResult findStaffAchieveRanking() { + return null; + } + + @ApiOperation(value = "门店业绩排行榜", notes = "门店业绩排行榜") + @ApiResponses({ + @ApiResponse(code = 200, message = "ok", response = RankingDto.class) + }) + public AjaxResult findShopAchieveRanking() { + return null; + } + + public AjaxResult findBeauticianAchieveRanking() { + return null; + } +} 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 new file mode 100644 index 0000000..34436ab --- /dev/null +++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStatisticsAction.java @@ -0,0 +1,8 @@ +package com.matrix.system.app.action; + +/** + * @author wzy + * @date 2020-12-28 + **/ +public class ApiStatisticsAction { +} diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java index 646b368..35b08e6 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/QuestionVo.java @@ -2,6 +2,7 @@ import com.matrix.core.tools.StringUtils; import com.matrix.system.hive.bean.Answer; +import com.matrix.system.hive.bean.VipAnswer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -23,7 +24,11 @@ @ApiModelProperty(value = "类型 1-文本 输入框 2-单选 下拉框 3-多选 多选框 4-长文本 文本域 5-标题 只显示即可") private String type; + @ApiModelProperty(value = "单选、多选的选项") private List<Answer> answers; + + @ApiModelProperty(value = "回显答案") + private VipAnswer vipAnswer; public Long getId() { return id; @@ -72,4 +77,12 @@ public void setAnswers(List<Answer> answers) { this.answers = answers; } + + public VipAnswer getVipAnswer() { + return vipAnswer; + } + + public void setVipAnswer(VipAnswer vipAnswer) { + this.vipAnswer = vipAnswer; + } } diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/RankingDto.java b/zq-erp/src/main/java/com/matrix/system/app/vo/RankingDto.java new file mode 100644 index 0000000..a43bb16 --- /dev/null +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/RankingDto.java @@ -0,0 +1,47 @@ +package com.matrix.system.app.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; + +/** + * @author wzy + * @date 2020-12-28 + **/ +@ApiModel(value = "RankingDto", description = "排行榜返回参数类") +public class RankingDto { + + @ApiModelProperty(value = "姓名") + private String name; + + @ApiModelProperty(value = "头像") + private String photo; + + @ApiModelProperty(value = "金额") + private BigDecimal amount; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhoto() { + return photo; + } + + public void setPhoto(String photo) { + this.photo = photo; + } + + public BigDecimal getAmount() { + return amount; + } + + public void setAmount(BigDecimal amount) { + this.amount = amount; + } +} -- Gitblit v1.9.1