Skip to content

Y
yn-health-science
Commit 656ee930 authored by 徐俊's avatar 徐俊
Browse files
Options

xujun

parent 3e4f764a
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 45 deletions
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectAssign.java
View file @ 656ee930
...@@ -24,21 +24,41 @@ public class ComProjectAssign extends BaseEntity { ...@@ -24,21 +24,41 @@ public class ComProjectAssign extends BaseEntity {
/** 分配年度 */ /** 分配年度 */
@ApiModelProperty(value = "分配年度", position = 3) @ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear; private Integer assignYear;
/** 立项依据 */ /** score1 */
@ApiModelProperty(value = "立项依据", position = 4) @ApiModelProperty(value = "score1", position = 4)
private BigDecimal projectBasis; private BigDecimal score1;
/** 项目研究的学术价值 */ @ApiModelProperty(value = "score2", position = 4)
@ApiModelProperty(value = "项目研究的学术价值", position = 5) private BigDecimal score2;
private BigDecimal academicValue; @ApiModelProperty(value = "score3", position = 4)
/** 创新性与科学意义 */ private BigDecimal score3;
@ApiModelProperty(value = "创新性与科学意义", position = 6) @ApiModelProperty(value = "score4", position = 4)
private BigDecimal innovation; private BigDecimal score4;
/** 研究方案 */ @ApiModelProperty(value = "score5", position = 4)
@ApiModelProperty(value = "研究方案", position = 7) private BigDecimal score5;
private BigDecimal researchPlan; @ApiModelProperty(value = "score6", position = 4)
/** 预期结果 */ private BigDecimal score6;
@ApiModelProperty(value = "预期结果", position = 8) @ApiModelProperty(value = "score7", position = 4)
private BigDecimal expectedResults; private BigDecimal score7;
@ApiModelProperty(value = "score8", position = 4)
private BigDecimal score8;
@ApiModelProperty(value = "score9", position = 4)
private BigDecimal score9;
@ApiModelProperty(value = "score10", position = 4)
private BigDecimal score10;
@ApiModelProperty(value = "score11", position = 4)
private BigDecimal score11;
@ApiModelProperty(value = "score12", position = 4)
private BigDecimal score12;
@ApiModelProperty(value = "score13", position = 4)
private BigDecimal score13;
@ApiModelProperty(value = "score14", position = 4)
private BigDecimal score14;
@ApiModelProperty(value = "score15", position = 4)
private BigDecimal score15;
@ApiModelProperty(value = "score16", position = 4)
private BigDecimal score16;
@ApiModelProperty(value = "score17", position = 4)
private BigDecimal score17;
/** 总分 */ /** 总分 */
@ApiModelProperty(value = "总分", position = 9) @ApiModelProperty(value = "总分", position = 9)
private BigDecimal totalScore; private BigDecimal totalScore;
...@@ -49,4 +69,7 @@ public class ComProjectAssign extends BaseEntity { ...@@ -49,4 +69,7 @@ public class ComProjectAssign extends BaseEntity {
/** 审核状态（0 未评审 1 保存 2 已提交） */ /** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11) @ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState; private Integer auditState;
/** 是否支持立项（0 不支持 1 支持） */
@ApiModelProperty(value = "审核状态（0 不支持 1 支持）", position = 11)
private Integer supportState;
} }
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectAssignDTO.java
View file @ 656ee930
...@@ -28,21 +28,40 @@ public class ComProjectAssignDTO extends BaseDTO { ...@@ -28,21 +28,40 @@ public class ComProjectAssignDTO extends BaseDTO {
/** 分配年度 */ /** 分配年度 */
@ApiModelProperty(value = "分配年度", position = 3) @ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear; private Integer assignYear;
/** 立项依据 */ @ApiModelProperty(value = "score1", position = 4)
@ApiModelProperty(value = "立项依据", position = 4) private BigDecimal score1;
private BigDecimal projectBasis; @ApiModelProperty(value = "score2", position = 4)
/** 项目研究的学术价值 */ private BigDecimal score2;
@ApiModelProperty(value = "项目研究的学术价值", position = 5) @ApiModelProperty(value = "score3", position = 4)
private BigDecimal academicValue; private BigDecimal score3;
/** 创新性与科学意义 */ @ApiModelProperty(value = "score4", position = 4)
@ApiModelProperty(value = "创新性与科学意义", position = 6) private BigDecimal score4;
private BigDecimal innovation; @ApiModelProperty(value = "score5", position = 4)
/** 研究方案 */ private BigDecimal score5;
@ApiModelProperty(value = "研究方案", position = 7) @ApiModelProperty(value = "score6", position = 4)
private BigDecimal researchPlan; private BigDecimal score6;
/** 预期结果 */ @ApiModelProperty(value = "score7", position = 4)
@ApiModelProperty(value = "预期结果", position = 8) private BigDecimal score7;
private BigDecimal expectedResults; @ApiModelProperty(value = "score8", position = 4)
private BigDecimal score8;
@ApiModelProperty(value = "score9", position = 4)
private BigDecimal score9;
@ApiModelProperty(value = "score10", position = 4)
private BigDecimal score10;
@ApiModelProperty(value = "score11", position = 4)
private BigDecimal score11;
@ApiModelProperty(value = "score12", position = 4)
private BigDecimal score12;
@ApiModelProperty(value = "score13", position = 4)
private BigDecimal score13;
@ApiModelProperty(value = "score14", position = 4)
private BigDecimal score14;
@ApiModelProperty(value = "score15", position = 4)
private BigDecimal score15;
@ApiModelProperty(value = "score16", position = 4)
private BigDecimal score16;
@ApiModelProperty(value = "score17", position = 4)
private BigDecimal score17;
/** 总分 */ /** 总分 */
@ApiModelProperty(value = "总分", position = 9) @ApiModelProperty(value = "总分", position = 9)
private BigDecimal totalScore; private BigDecimal totalScore;
...@@ -53,6 +72,9 @@ public class ComProjectAssignDTO extends BaseDTO { ...@@ -53,6 +72,9 @@ public class ComProjectAssignDTO extends BaseDTO {
/** 审核状态（0 未评审 1 保存 2 已提交） */ /** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 已评审）", position = 11) @ApiModelProperty(value = "审核状态（0 未评审 1 已评审）", position = 11)
private Integer auditState; private Integer auditState;
/** 是否支持立项（0 不支持 1 支持） */
@ApiModelProperty(value = "审核状态（0 不支持 1 支持）", position = 11)
private Integer supportState;
/** 评审状态 */ /** 评审状态 */
private String stateName; private String stateName;
......
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectAssignQueryVO.java
View file @ 656ee930
...@@ -29,21 +29,40 @@ public class ComProjectAssignQueryVO extends PaginationVO { ...@@ -29,21 +29,40 @@ public class ComProjectAssignQueryVO extends PaginationVO {
/** 分配年度 */ /** 分配年度 */
@ApiModelProperty(value = "分配年度", position = 3) @ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear; private Integer assignYear;
/** 立项依据 */ @ApiModelProperty(value = "score1", position = 4)
@ApiModelProperty(value = "立项依据", position = 4) private BigDecimal score1;
private BigDecimal projectBasis; @ApiModelProperty(value = "score2", position = 4)
/** 项目研究的学术价值 */ private BigDecimal score2;
@ApiModelProperty(value = "项目研究的学术价值", position = 5) @ApiModelProperty(value = "score3", position = 4)
private BigDecimal academicValue; private BigDecimal score3;
/** 创新性与科学意义 */ @ApiModelProperty(value = "score4", position = 4)
@ApiModelProperty(value = "创新性与科学意义", position = 6) private BigDecimal score4;
private BigDecimal innovation; @ApiModelProperty(value = "score5", position = 4)
/** 研究方案 */ private BigDecimal score5;
@ApiModelProperty(value = "研究方案", position = 7) @ApiModelProperty(value = "score6", position = 4)
private BigDecimal researchPlan; private BigDecimal score6;
/** 预期结果 */ @ApiModelProperty(value = "score7", position = 4)
@ApiModelProperty(value = "预期结果", position = 8) private BigDecimal score7;
private BigDecimal expectedResults; @ApiModelProperty(value = "score8", position = 4)
private BigDecimal score8;
@ApiModelProperty(value = "score9", position = 4)
private BigDecimal score9;
@ApiModelProperty(value = "score10", position = 4)
private BigDecimal score10;
@ApiModelProperty(value = "score11", position = 4)
private BigDecimal score11;
@ApiModelProperty(value = "score12", position = 4)
private BigDecimal score12;
@ApiModelProperty(value = "score13", position = 4)
private BigDecimal score13;
@ApiModelProperty(value = "score14", position = 4)
private BigDecimal score14;
@ApiModelProperty(value = "score15", position = 4)
private BigDecimal score15;
@ApiModelProperty(value = "score16", position = 4)
private BigDecimal score16;
@ApiModelProperty(value = "score17", position = 4)
private BigDecimal score17;
/** 总分 */ /** 总分 */
@ApiModelProperty(value = "总分", position = 9) @ApiModelProperty(value = "总分", position = 9)
private BigDecimal totalScore; private BigDecimal totalScore;
...@@ -54,6 +73,9 @@ public class ComProjectAssignQueryVO extends PaginationVO { ...@@ -54,6 +73,9 @@ public class ComProjectAssignQueryVO extends PaginationVO {
/** 审核状态（0 未评审 1 保存 2 已提交） */ /** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 已评审）", position = 11) @ApiModelProperty(value = "审核状态（0 未评审 1 已评审）", position = 11)
private Integer auditState; private Integer auditState;
/** 是否支持立项（0 不支持 1 支持） */
@ApiModelProperty(value = "审核状态（0 不支持 1 支持）", position = 11)
private Integer supportState;
/** 证件号 */ /** 证件号 */
@ExcelProperty("证件号") @ExcelProperty("证件号")
......
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