瀏覽代碼

修复bug

lihui007 4 年之前
父節點
當前提交
f0ae05435e

+ 0 - 1
common/src/main/java/com/huaxu/util/RedisUtil.java

@@ -532,7 +532,6 @@ public class RedisUtil {
      * @return
      */
     public List<String> doZrevrange(String key, Integer start, Integer end) {
-
         List<String> stringList = new ArrayList<>();
         RedisSerializer<String> redisSerializer = getRedisSerializer();
         Set<byte[]> strBytes = redisTemplate.execute((RedisCallback<Set<byte[]>>) connection -> connection.zRevRange(redisSerializer.serialize(key), start, end));

+ 38 - 0
operation_manager/src/main/java/com/huaxu/base/BaseEntity.java

@@ -0,0 +1,38 @@
+package com.huaxu.base;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName BaseEntity
+ * @Description: 公共基类
+ * @Author lihui
+ * @Date 2021/4/20
+ * @Version V1.0
+ **/
+@Data
+@ApiModel
+public class BaseEntity implements Serializable {
+
+    @ApiModelProperty(value = "主键")
+    private Integer id;
+
+    @ApiModelProperty(value = "创建日期")
+    private Date dateCreate;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "更新时间")
+    private Date dateUpdate;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "数据删除标记")
+    private Integer status;
+}

+ 33 - 0
operation_manager/src/main/java/com/huaxu/performance/entity/PerformanceEvaluateSetting.java

@@ -0,0 +1,33 @@
+package com.huaxu.performance.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @ClassName PerformanceEvaluateSetting
+ * @Description: 考评项设置
+ * @Author lihui
+ * @Date 2021/4/20
+ * @Version V1.0
+ **/
+@Data
+@ApiModel
+public class PerformanceEvaluateSetting extends BaseEntity implements Serializable {
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "考评类型")
+    private Integer evaluateType;
+
+    @ApiModelProperty(value = "分值")
+    private BigDecimal score;
+
+    @ApiModelProperty(value = "评分标准")
+    private String scoringCriteria;
+
+}

+ 36 - 0
operation_manager/src/main/java/com/huaxu/performance/entity/PerformanceScoreSetting.java

@@ -0,0 +1,36 @@
+package com.huaxu.performance.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @ClassName PerformanceScoreSetting
+ * @Description: 绩效考评得分设置
+ * @Author lihui
+ * @Date 2021/4/20
+ * @Version V1.0
+ **/
+@Data
+@ApiModel
+public class PerformanceScoreSetting extends BaseEntity implements Serializable {
+
+    @ApiModelProperty(value = "考评项设置ID")
+    private String pesId;
+
+    @ApiModelProperty(value = "得分")
+    private BigDecimal score;
+
+    @ApiModelProperty(value = "得分条件")
+    private Integer condition;
+
+    @ApiModelProperty(value = "最小范围")
+    private BigDecimal minScore;
+
+    @ApiModelProperty(value = "最大范围")
+    private BigDecimal maxScore;
+
+}