Commit 1566d549 authored by wangxl's avatar wangxl

1

parent 453b7f71
...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; ...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.apache.poi.hpsf.Decimal;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -34,6 +35,8 @@ public class ComEvaluationItem extends BaseEntity { ...@@ -34,6 +35,8 @@ public class ComEvaluationItem extends BaseEntity {
/** 值类型:1单选、2多选、3打分 */ /** 值类型:1单选、2多选、3打分 */
@ApiModelProperty(value = "值类型:1单选、2多选、3打分", position = 5) @ApiModelProperty(value = "值类型:1单选、2多选、3打分", position = 5)
private Integer valueType; private Integer valueType;
/** 最大分值 */
private Decimal maxScore;
/** 备注 */ /** 备注 */
@ApiModelProperty(value = "备注", position = 6) @ApiModelProperty(value = "备注", position = 6)
@Length(max=200, message = "备注不能大于200") @Length(max=200, message = "备注不能大于200")
......
...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel; ...@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.apache.poi.hpsf.Decimal;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -38,7 +39,7 @@ public class ComEvaluationItemDTO extends BaseDTO { ...@@ -38,7 +39,7 @@ public class ComEvaluationItemDTO extends BaseDTO {
@ApiModelProperty(value = "值类型:1单选、2多选、3打分", position = 5) @ApiModelProperty(value = "值类型:1单选、2多选、3打分", position = 5)
private Integer valueType; private Integer valueType;
/** 最大分值 */ /** 最大分值 */
private Integer maxScore; private Decimal maxScore;
/** 备注 */ /** 备注 */
@ApiModelProperty(value = "备注", position = 6) @ApiModelProperty(value = "备注", position = 6)
@Length(max=200, message = "备注不能大于200") @Length(max=200, message = "备注不能大于200")
......
...@@ -104,7 +104,6 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD ...@@ -104,7 +104,6 @@ public class ComTalentAssignServiceImpl extends BaseServiceImpl<ComTalentAssignD
return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize()); return new Pagination<>(dtoList, page.getTotal(), vo.getPageSize());
} }
@Transactional @Transactional
public String assignTalent(Map<String, Object> map) { public String assignTalent(Map<String, Object> map) {
List<String> talents = null; List<String> talents = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment