From 656ee930e9d5302b0cf80bbaced3b98f30b93f50 Mon Sep 17 00:00:00 2001
From: xujun <271087757@qq.com>
Date: Thu, 5 Dec 2024 16:37:56 +0800
Subject: [PATCH] xujun
---
.../science/entity/ComProjectAssign.java | 53 +++++++++++++------
.../param/dto/ComProjectAssignDTO.java | 52 ++++++++++++------
.../param/query/ComProjectAssignQueryVO.java | 52 ++++++++++++------
3 files changed, 112 insertions(+), 45 deletions(-)
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectAssign.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectAssign.java
index e95eef9..404b21c 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectAssign.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectAssign.java
@@ -24,21 +24,41 @@ public class ComProjectAssign extends BaseEntity {
/** 分配年度 */
@ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear;
- /** 立项依据 */
- @ApiModelProperty(value = "立项依据", position = 4)
- private BigDecimal projectBasis;
- /** 项目研究的学术价值 */
- @ApiModelProperty(value = "项目研究的学术价值", position = 5)
- private BigDecimal academicValue;
- /** 创新性与科学意义 */
- @ApiModelProperty(value = "创新性与科学意义", position = 6)
- private BigDecimal innovation;
- /** 研究方案 */
- @ApiModelProperty(value = "研究方案", position = 7)
- private BigDecimal researchPlan;
- /** 预期结果 */
- @ApiModelProperty(value = "预期结果", position = 8)
- private BigDecimal expectedResults;
+ /** score1 */
+ @ApiModelProperty(value = "score1", position = 4)
+ private BigDecimal score1;
+ @ApiModelProperty(value = "score2", position = 4)
+ private BigDecimal score2;
+ @ApiModelProperty(value = "score3", position = 4)
+ private BigDecimal score3;
+ @ApiModelProperty(value = "score4", position = 4)
+ private BigDecimal score4;
+ @ApiModelProperty(value = "score5", position = 4)
+ private BigDecimal score5;
+ @ApiModelProperty(value = "score6", position = 4)
+ private BigDecimal score6;
+ @ApiModelProperty(value = "score7", position = 4)
+ 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)
private BigDecimal totalScore;
@@ -49,4 +69,7 @@ public class ComProjectAssign extends BaseEntity {
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 保存 2 已提交）", position = 11)
private Integer auditState;
+ /** 是否支持立项（0 不支持 1 支持） */
+ @ApiModelProperty(value = "审核状态（0 不支持 1 支持）", position = 11)
+ private Integer supportState;
}
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectAssignDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectAssignDTO.java
index 6cfdb52..6d5ff66 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectAssignDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectAssignDTO.java
@@ -28,21 +28,40 @@ public class ComProjectAssignDTO extends BaseDTO {
/** 分配年度 */
@ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear;
- /** 立项依据 */
- @ApiModelProperty(value = "立项依据", position = 4)
- private BigDecimal projectBasis;
- /** 项目研究的学术价值 */
- @ApiModelProperty(value = "项目研究的学术价值", position = 5)
- private BigDecimal academicValue;
- /** 创新性与科学意义 */
- @ApiModelProperty(value = "创新性与科学意义", position = 6)
- private BigDecimal innovation;
- /** 研究方案 */
- @ApiModelProperty(value = "研究方案", position = 7)
- private BigDecimal researchPlan;
- /** 预期结果 */
- @ApiModelProperty(value = "预期结果", position = 8)
- private BigDecimal expectedResults;
+ @ApiModelProperty(value = "score1", position = 4)
+ private BigDecimal score1;
+ @ApiModelProperty(value = "score2", position = 4)
+ private BigDecimal score2;
+ @ApiModelProperty(value = "score3", position = 4)
+ private BigDecimal score3;
+ @ApiModelProperty(value = "score4", position = 4)
+ private BigDecimal score4;
+ @ApiModelProperty(value = "score5", position = 4)
+ private BigDecimal score5;
+ @ApiModelProperty(value = "score6", position = 4)
+ private BigDecimal score6;
+ @ApiModelProperty(value = "score7", position = 4)
+ 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)
private BigDecimal totalScore;
@@ -53,6 +72,9 @@ public class ComProjectAssignDTO extends BaseDTO {
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 已评审）", position = 11)
private Integer auditState;
+ /** 是否支持立项（0 不支持 1 支持） */
+ @ApiModelProperty(value = "审核状态（0 不支持 1 支持）", position = 11)
+ private Integer supportState;
/** 评审状态 */
private String stateName;
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectAssignQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectAssignQueryVO.java
index a780aef..9521d76 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectAssignQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectAssignQueryVO.java
@@ -29,21 +29,40 @@ public class ComProjectAssignQueryVO extends PaginationVO {
/** 分配年度 */
@ApiModelProperty(value = "分配年度", position = 3)
private Integer assignYear;
- /** 立项依据 */
- @ApiModelProperty(value = "立项依据", position = 4)
- private BigDecimal projectBasis;
- /** 项目研究的学术价值 */
- @ApiModelProperty(value = "项目研究的学术价值", position = 5)
- private BigDecimal academicValue;
- /** 创新性与科学意义 */
- @ApiModelProperty(value = "创新性与科学意义", position = 6)
- private BigDecimal innovation;
- /** 研究方案 */
- @ApiModelProperty(value = "研究方案", position = 7)
- private BigDecimal researchPlan;
- /** 预期结果 */
- @ApiModelProperty(value = "预期结果", position = 8)
- private BigDecimal expectedResults;
+ @ApiModelProperty(value = "score1", position = 4)
+ private BigDecimal score1;
+ @ApiModelProperty(value = "score2", position = 4)
+ private BigDecimal score2;
+ @ApiModelProperty(value = "score3", position = 4)
+ private BigDecimal score3;
+ @ApiModelProperty(value = "score4", position = 4)
+ private BigDecimal score4;
+ @ApiModelProperty(value = "score5", position = 4)
+ private BigDecimal score5;
+ @ApiModelProperty(value = "score6", position = 4)
+ private BigDecimal score6;
+ @ApiModelProperty(value = "score7", position = 4)
+ 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)
private BigDecimal totalScore;
@@ -54,6 +73,9 @@ public class ComProjectAssignQueryVO extends PaginationVO {
/** 审核状态（0 未评审 1 保存 2 已提交） */
@ApiModelProperty(value = "审核状态（0 未评审 1 已评审）", position = 11)
private Integer auditState;
+ /** 是否支持立项（0 不支持 1 支持） */
+ @ApiModelProperty(value = "审核状态（0 不支持 1 支持）", position = 11)
+ private Integer supportState;
/** 证件号 */
@ExcelProperty("证件号")
--
2.18.0