diff --git a/src/main/java/com/lz/modules/performance/controller/ChartController.java b/src/main/java/com/lz/modules/performance/controller/ChartController.java index ddd7d238..cedc8e44 100644 --- a/src/main/java/com/lz/modules/performance/controller/ChartController.java +++ b/src/main/java/com/lz/modules/performance/controller/ChartController.java @@ -41,6 +41,12 @@ public class ChartController extends AbstractController{ } + public R rankList(){ + + return R.ok(); + } + + } diff --git a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java index 3e27d0b8..80282077 100644 --- a/src/main/java/com/lz/modules/performance/req/ChartResultReq.java +++ b/src/main/java/com/lz/modules/performance/req/ChartResultReq.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.io.Serializable; +import java.time.YearMonth; /** * @Author: djc @@ -16,10 +16,10 @@ import java.io.Serializable; public class ChartResultReq { //考核类型 月度 季度 @ApiModelProperty(value = "考核类型 月度,自定义",name = "type") - private int type; + private int type = 0; - @ApiModelProperty(value = "如果为月度不为空",name = "month") - private String month; + @ApiModelProperty(value = "如果为月度 默认当前月",name = "month") + private String month = YearMonth.now().toString(); @ApiModelProperty(value = "自定义起始时间",name = "startTime") private String startTime; diff --git a/src/main/java/com/lz/modules/performance/res/ResultRankListRes.java b/src/main/java/com/lz/modules/performance/res/ResultRankListRes.java new file mode 100644 index 00000000..d6bd42e8 --- /dev/null +++ b/src/main/java/com/lz/modules/performance/res/ResultRankListRes.java @@ -0,0 +1,26 @@ +package com.lz.modules.performance.res; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @Author: djc + * @Desc: 绩效排名列表 + * @Date: 2020/10/19 15:07 + */ +@Data +@ApiModel(value = "绩效排名列表") +public class ResultRankListRes { + //姓名 + private String staffName; + //工号 + private String staffNo; + //部门 + private String departmentName; + //绩效等级 + private String scoreLevel; + //绩效结果 + private String result; + //绩效排名 + private String rank; +} diff --git a/src/main/java/com/lz/modules/performance/res/TaskListRes.java b/src/main/java/com/lz/modules/performance/res/TaskListRes.java index b1483d1e..73f511b4 100644 --- a/src/main/java/com/lz/modules/performance/res/TaskListRes.java +++ b/src/main/java/com/lz/modules/performance/res/TaskListRes.java @@ -6,7 +6,7 @@ import lombok.Data; /** * @Author: djc - * @Desc: + * @Desc: 事项列表 * @Date: 2020/10/13 17:15 */ @Data