Skip to content

Y
yn-health-science
Commit aa1d270f authored by wangxl's avatar wangxl
Browse files
Options

77

parent cf27ed15
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 494 deletions
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
View file @ aa1d270f
...@@ -86,6 +86,31 @@ public class ComProjectBasic extends BaseEntity { ...@@ -86,6 +86,31 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "其他", position = 43) @ApiModelProperty(value = "其他", position = 43)
private BigDecimal otherFunding; private BigDecimal otherFunding;
/** 项目实施目标 */
@ApiModelProperty(value = "项目实施目标", position = 28 )
@Length(max=2147483647, message = "项目实施目标不能大于2147483647")
private String researchContent;
/** 主要技术指标 */
@ApiModelProperty(value = "主要技术指标", position = 35 )
@Length(max=2147483647, message = "主要技术指标不能大于2147483647")
private String technologyTarget;
/** 主要经济指标 */
@ApiModelProperty(value = "主要经济指标", position = 35 )
@Length(max=2147483647, message = "主要经济指标不能大于2147483647")
private String economyTarget;
/** 项目实施中形成的示范基地、中试线、生产线及其规模等 */
@ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 )
@Length(max=2147483647, message = "项目实施中形成的示范基地、中试线、生产线及其规模等不能大于2147483647")
private String achievementTarget;
/** 科技报告考核指标 */
@ApiModelProperty(value = "科技报告考核指标", position = 35 )
@Length(max=2147483647, message = "科技报告考核指标不能大于2147483647")
private String technologyReportsTarget;
/** 其他应考核的指标 */
@ApiModelProperty(value = "其他应考核的指标", position = 35 )
@Length(max=2147483647, message = "其他应考核的指标不能大于2147483647")
private String otherTarget;
@ApiModelProperty(value = "项目属性Id", position = 36) @ApiModelProperty(value = "项目属性Id", position = 36)
@Length(max=36, message = "项目属性Id不能大于36") @Length(max=36, message = "项目属性Id不能大于36")
private String projAttribute; private String projAttribute;
......
science-admin/src/main/java/com/yiboshi/science/entity/ComProjectTask.java
View file @ aa1d270f
...@@ -50,6 +50,7 @@ public class ComProjectTask extends BaseEntity { ...@@ -50,6 +50,7 @@ public class ComProjectTask extends BaseEntity {
@ApiModelProperty(value = "结束日期", position = 8 ) @ApiModelProperty(value = "结束日期", position = 8 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date endDate; private Date endDate;
/** 组织机构代码/统一社会信用代码 */ /** 组织机构代码/统一社会信用代码 */
@ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 ) @ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50") @Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
...@@ -170,6 +171,10 @@ public class ComProjectTask extends BaseEntity { ...@@ -170,6 +171,10 @@ public class ComProjectTask extends BaseEntity {
@ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 ) @ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 )
@Length(max=2147483647, message = "项目实施中形成的示范基地、中试线、生产线及其规模等不能大于2147483647") @Length(max=2147483647, message = "项目实施中形成的示范基地、中试线、生产线及其规模等不能大于2147483647")
private String achievementTarget; private String achievementTarget;
/** 科技报告考核指标 */
@ApiModelProperty(value = "科技报告考核指标", position = 35 )
@Length(max=2147483647, message = "科技报告考核指标不能大于2147483647")
private String technologyReportsTarget;
/** 其他应考核的指标 */ /** 其他应考核的指标 */
@ApiModelProperty(value = "其他应考核的指标", position = 35 ) @ApiModelProperty(value = "其他应考核的指标", position = 35 )
@Length(max=2147483647, message = "其他应考核的指标不能大于2147483647") @Length(max=2147483647, message = "其他应考核的指标不能大于2147483647")
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComEvaluationContentDTO.java
View file @ aa1d270f
package com.yiboshi.science.param.dto; package com.yiboshi.science.param.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.BaseDTO; import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -9,7 +8,6 @@ import lombok.EqualsAndHashCode; ...@@ -9,7 +8,6 @@ import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
@Data @Data
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComEvaluationItemDTO.java
View file @ aa1d270f
package com.yiboshi.science.param.dto; package com.yiboshi.science.param.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.BaseDTO; import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -9,7 +8,6 @@ import lombok.EqualsAndHashCode; ...@@ -9,7 +8,6 @@ import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
@Data @Data
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComExpertBatchDTO.java
View file @ aa1d270f
package com.yiboshi.science.param.dto; package com.yiboshi.science.param.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.BaseDTO; import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -8,7 +7,6 @@ import lombok.Data; ...@@ -8,7 +7,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.util.Date;
import java.util.List; import java.util.List;
@Data @Data
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
View file @ aa1d270f
...@@ -85,6 +85,31 @@ public class ComProjectBasicDTO extends BaseDTO { ...@@ -85,6 +85,31 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "其他", position = 43) @ApiModelProperty(value = "其他", position = 43)
private BigDecimal otherFunding; private BigDecimal otherFunding;
/** 项目实施目标 */
@ApiModelProperty(value = "项目实施目标", position = 28 )
@Length(max=2147483647, message = "项目实施目标不能大于2147483647")
private String researchContent;
/** 主要技术指标 */
@ApiModelProperty(value = "主要技术指标", position = 35 )
@Length(max=2147483647, message = "主要技术指标不能大于2147483647")
private String technologyTarget;
/** 主要经济指标 */
@ApiModelProperty(value = "主要经济指标", position = 35 )
@Length(max=2147483647, message = "主要经济指标不能大于2147483647")
private String economyTarget;
/** 项目实施中形成的示范基地、中试线、生产线及其规模等 */
@ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 )
@Length(max=2147483647, message = "项目实施中形成的示范基地、中试线、生产线及其规模等不能大于2147483647")
private String achievementTarget;
/** 科技报告考核指标 */
@ApiModelProperty(value = "科技报告考核指标", position = 35 )
@Length(max=2147483647, message = "科技报告考核指标不能大于2147483647")
private String technologyReportsTarget;
/** 其他应考核的指标 */
@ApiModelProperty(value = "其他应考核的指标", position = 35 )
@Length(max=2147483647, message = "其他应考核的指标不能大于2147483647")
private String otherTarget;
@ApiModelProperty(value = "项目属性Id", position = 36) @ApiModelProperty(value = "项目属性Id", position = 36)
@Length(max=36, message = "项目属性Id不能大于36") @Length(max=36, message = "项目属性Id不能大于36")
private String projAttribute; private String projAttribute;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectConclusionDTO.java
View file @ aa1d270f
...@@ -2,13 +2,10 @@ package com.yiboshi.science.param.dto; ...@@ -2,13 +2,10 @@ package com.yiboshi.science.param.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.BaseDTO; import com.yiboshi.science.base.BaseDTO;
import com.yiboshi.science.base.BaseEntity;
import io.swagger.annotations.ApiModel; 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 lombok.Getter;
import lombok.Setter;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal; import java.math.BigDecimal;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
View file @ aa1d270f
...@@ -94,7 +94,6 @@ public class ComProjectDTO extends BaseDTO { ...@@ -94,7 +94,6 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "平均分", position = 4) @ApiModelProperty(value = "平均分", position = 4)
private BigDecimal averageScore; private BigDecimal averageScore;
/** 项目Id */ /** 项目Id */
@ApiModelProperty(value="项目Id") @ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36") @Length(max=36, message = "Id不能大于36")
...@@ -154,6 +153,31 @@ public class ComProjectDTO extends BaseDTO { ...@@ -154,6 +153,31 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "其他", position = 43) @ApiModelProperty(value = "其他", position = 43)
private BigDecimal otherFunding; private BigDecimal otherFunding;
/** 项目实施目标 */
@ApiModelProperty(value = "项目实施目标", position = 28 )
@Length(max=2147483647, message = "项目实施目标不能大于2147483647")
private String researchContent;
/** 主要技术指标 */
@ApiModelProperty(value = "主要技术指标", position = 35 )
@Length(max=2147483647, message = "主要技术指标不能大于2147483647")
private String technologyTarget;
/** 主要经济指标 */
@ApiModelProperty(value = "主要经济指标", position = 35 )
@Length(max=2147483647, message = "主要经济指标不能大于2147483647")
private String economyTarget;
/** 项目实施中形成的示范基地、中试线、生产线及其规模等 */
@ApiModelProperty(value = "项目实施中形成的示范基地、中试线、生产线及其规模等", position = 35 )
@Length(max=2147483647, message = "项目实施中形成的示范基地、中试线、生产线及其规模等不能大于2147483647")
private String achievementTarget;
/** 科技报告考核指标 */
@ApiModelProperty(value = "科技报告考核指标", position = 35 )
@Length(max=2147483647, message = "科技报告考核指标不能大于2147483647")
private String technologyReportsTarget;
/** 其他应考核的指标 */
@ApiModelProperty(value = "其他应考核的指标", position = 35 )
@Length(max=2147483647, message = "其他应考核的指标不能大于2147483647")
private String otherTarget;
@ApiModelProperty(value = "项目属性Id", position = 36) @ApiModelProperty(value = "项目属性Id", position = 36)
@Length(max=36, message = "项目属性Id不能大于36") @Length(max=36, message = "项目属性Id不能大于36")
private String projAttribute; private String projAttribute;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectKpitDTO.java deleted 100644 → 0
View file @ cf27ed15
package com.yiboshi.science.param.dto;
import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "项目绩效指标表DTO")
public class ComProjectKpitDTO extends BaseDTO {
/** 一级指标名称 */
@ApiModelProperty(value = "一级指标名称", position = 8)
private String oneLevelName;
/** 二级指标名称 */
@ApiModelProperty(value = "二级指标名称", position = 8)
private String towLevelName;
/** 级别Id */
@ApiModelProperty(value = "级别Id", position = 8)
@Length(max=36, message = "级别Id不能大于36")
private String levelId;
/** 类型Id */
@ApiModelProperty(value = "类型Id", position = 7)
private Integer typeId;
/** 父Id */
@ApiModelProperty(value = "父Id", position = 8)
@Length(max=36, message = "父Id不能大于36")
private String parentId;
/** kpitId */
@ApiModelProperty(value = "kpitId", position = 8)
@Length(max=36, message = "kpitId不能大于36")
private String kpitId;
/** 绩效类型名称 */
@ApiModelProperty(value = "绩效类型名称", position = 1 )
@Length(max=200, message = "绩效类型名称不能大于200")
private String kpitName;
/** 指标值 */
@ApiModelProperty(value = "指标值", position = 7)
private Integer targetValue;
/** 绩效标准 */
@ApiModelProperty(value = "绩效标准", position = 7)
private Integer performanceStandard;
/** 显示顺序 */
@ApiModelProperty(value = "显示顺序", position = 7)
private Integer displayOrder;
/** 一级指标显示 */
@ApiModelProperty(value = "一级指标显示", position = 7)
private boolean oneDisplay;
/** 二级指标显示 */
@ApiModelProperty(value = "二级指标显示", position = 7)
private boolean towDisplay;
/** 一级指标行合并数 */
@ApiModelProperty(value = "一级指标行合并数", position = 7)
private Integer oneRowSpan;
/** 二级指标行合并数 */
@ApiModelProperty(value = "二级指标行合并数", position = 7)
private Integer towRowSpan;
/** 年度1指标 */
@ApiModelProperty(value = "年度1指标", position = 7)
private Integer yearValue1;
/** 年度2指标 */
@ApiModelProperty(value = "年度2指标", position = 7)
private Integer yearValue2;
/** 年度3指标 */
@ApiModelProperty(value = "年度3指标", position = 7)
private Integer yearValue3;
}
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectSubDTO.java deleted 100644 → 0
View file @ cf27ed15
package com.yiboshi.science.param.dto;
import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
/**
* 项目课颖设置表DTO
*
* @author lkl
* @version 2021-08-26
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(description = "项目课颖设置表DTO")
public class ComProjectSubDTO extends BaseDTO {
/** 对象Id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 )
@Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36")
private String objectId;
/** 课题名称 */
@ApiModelProperty(value = "课题名称", position = 2 )
@Length(max=100, message = "课题名称不能大于100")
private String projName;
/** 课题承担单位 */
@ApiModelProperty(value = "课题承担单位", position = 2 )
@Length(max=100, message = "单位国别不能大于100")
private String undertakingUnit;
/** 所在地 */
@ApiModelProperty(value = "所在地", position = 3 )
@Length(max=100, message = "所在地不能大于100")
private String address;
/** 课颖负责人 */
@ApiModelProperty(value = "课颖负责人", position = 2 )
@Length(max=50, message = "课颖负责人不能大于50")
private String director;
/** 课题预算总经费 */
@ApiModelProperty(value = "课题预算总经费", position = 4 )
private BigDecimal totalBudget;
/** 其中:省科技经费 */
@ApiModelProperty(value = "其中:省科技经费", position = 4 )
private BigDecimal govBudget;
/** 自筹经费 */
@ApiModelProperty(value = "自筹经费", position = 4 )
private BigDecimal selfBudget;
/** 合作单位 */
@ApiModelProperty(value = "合作单位", position = 4 )
@Length(max=100, message = "合作单位不能大于100")
private String cooperativeUnits;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 1 )
@Length(max=36, message = "附件Id不能大于36")
private String downloadId;
/** 附件名 */
@ApiModelProperty(value = "附件名", position = 6)
private String fileName;
/** URL */
@ApiModelProperty(value = "URL", position = 7)
private String downloadUrl;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java
View file @ aa1d270f
...@@ -8,7 +8,6 @@ import lombok.Data; ...@@ -8,7 +8,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ProjectKPIStatisticDTO.java deleted 100644 → 0
View file @ cf27ed15
package com.yiboshi.science.param.dto;
import com.yiboshi.science.base.BaseDTO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
public class ProjectKPIStatisticDTO extends BaseDTO {
private Integer reportYear;
private String projName;
private String managerDept;
private String appUnitName;
private String projAttribute;
private String projDeadline;
private Date startDate;
private Date endDate;
/** 总预算数 */
@ApiModelProperty(value = "总预算数", position = 3)
private BigDecimal totalBudget;
/** 申请专项经费(临床科技项目) */
@ApiModelProperty(value = "申请专项经费", position = 4)
private BigDecimal applyFunds;
/** 自筹经费(临床科技项目) */
@ApiModelProperty(value = "自筹经费", position = 5)
private BigDecimal selfFunds;
/** 用款总额 */
private BigDecimal yearTotal;
/** 省级财政资金 */
private BigDecimal yearApply;
/** 自筹资金 */
private BigDecimal yearSelf;
private String yearTarget;
private String year1Goal;
private String year2Goal;
private String year3Goal;
private Integer totalRowSpan; //总合并行数
private Integer outTarget; //一级指标(产出指标)
private Integer benefitTarget; //一级指标(效益指标)
private Integer satisfactionDegree; //一级指标(满意度指标)
private Integer quantityTarget; //二级指标(数量指标)
private Integer qualityTarget; //二级指标(质量指标)
private Integer validityTarget; //二级指标(时效指标)
private Integer costTarget; //二级指标(成本指标)
private Integer economicTarget; //二级指标(经济效益指标)
private Integer socialTarget; //二级指标(社会效益指标)
private Integer ecologicalTarget; //二级指标(生态效益指标)
private Integer sustainableTarget; //二级指标(可持续影响指标)
private Integer serviceTarget; //二级指标(服务对象满意度指标)
private List<ComProjectKpitDTO> threeLevel;
private List<ComProjectKpitDetailDTO> kpiList;
}
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java deleted 100644 → 0
View file @ cf27ed15
package com.yiboshi.science.param.query;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yiboshi.science.base.PaginationVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
/**
* 查询项目表VO
*
* @author lkl
* @version 2021-08-26
*/
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "查询项目表VO")
public class ComProjectBasicQueryVO extends PaginationVO{
/** 项目Id */
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
private String projId;
/** 每年工作时间(月) */
@ApiModelProperty(value = "每年工作时间(月)", position = 1 )
private Integer jobTime;
/** 主要研究领域 */
@ApiModelProperty(value = "主要研究领域", position = 19 )
@Length(max=200, message = "主要研究领域不能大于200")
private String mainResearchAreas;
/** 申报人通信地址 */
@ApiModelProperty(value = "申报人通信地址", position = 15 )
@Length(max=200, message = "申报人通信地址不能大于200")
private String address;
/** 单位联系人姓名 */
@ApiModelProperty(value = "单位联系人姓名", position = 16)
@Length(max=100, message = "单位联系人姓名不能大于100")
private String unitLinkName;
/** 单位联系人手机 */
@ApiModelProperty(value = "单位联系人手机", position = 16)
@Length(max=50, message = "单位联系人手机不能大于50")
private String unitLinkMobile;
/** 单位电子邮箱 */
@ApiModelProperty(value = "单位电子邮箱", position = 16)
@Length(max=100, message = "单位电子邮箱不能大于100")
private String unitLinkEmail;
/** 单位传真 */
@ApiModelProperty(value = "单位传真", position = 16)
@Length(max=100, message = "单位传真不能大于100")
private String unitLinkFax;
/** 选题范围 */
@ApiModelProperty(value = "选题范围", position = 1 )
@Length(max=200, message = "主要研究领域不能大于200")
private String subjectScope;
/** 项目摘要 */
@ApiModelProperty(value = "项目摘要", position = 13 )
@Length(max=600, message = "项目摘要不能大于600")
private String projAbstract;
/** 关键词 */
@ApiModelProperty(value = "关键词", position = 26 )
@Length(max=200, message = "关键词不能大于200")
private String projKeywords;
/** 项目总经费(万元） */
@ApiModelProperty(value = "项目总经费(万元）", position = 39)
private BigDecimal totalFunding;
/** 申请科技经费(万元) */
@ApiModelProperty(value = "申请科技经费(万元)", position = 40)
private BigDecimal govFunding;
/** 单位配套 */
@ApiModelProperty(value = "单位配套", position = 41)
private BigDecimal unitFunding;
/** 自筹 */
@ApiModelProperty(value = "自筹", position = 42)
private BigDecimal selfFunding;
/** 其他 */
@ApiModelProperty(value = "其他", position = 43)
private BigDecimal otherFunding;
@ApiModelProperty(value = "项目属性Id", position = 36)
@Length(max=36, message = "项目属性Id不能大于36")
private String projAttribute;
/** 年度总目标 */
@ApiModelProperty(value = "年度总目标", position = 14 )
@Length(max=1000, message = "年度总目标1000")
private String yearTarget;
/** 第一年目标 */
@ApiModelProperty(value = "第一年目标", position = 14 )
@Length(max=500, message = "第一年目标500")
private String year1Goal;
/** 第二年目标 */
@ApiModelProperty(value = "第二年目标", position = 14 )
@Length(max=500, message = "第二年目标500")
private String year2Goal;
/** 第三年目标 */
@ApiModelProperty(value = "第三年目标", position = 14 )
@Length(max=500, message = "第三年目标500")
private String year3Goal;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
/** 备注 */
@ApiModelProperty(value = "备注", position = 38 )
@Length(max=65535, message = "备注不能大于65535")
private String remark;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectFundPlanQueryVO.java deleted 100644 → 0
View file @ cf27ed15
package com.yiboshi.science.param.query;
import com.yiboshi.science.base.PaginationVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
/**
* 年度用款计划表VO
*
* @author xujun
* @version 2024-11-28
*/
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "年度用款计划表VO")
public class ComProjectFundPlanQueryVO extends PaginationVO{
/** 用款计划Id */
@ApiModelProperty(value = "用款计划Id", position = 2 )
@Length(max=36, message = "用款计划Id不能大于36")
private String fundId;
/** 对象id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象id（项目Id/任务书Id）", position = 2 )
@Length(max=36, message = "对象id（项目Id/任务书Id）不能大于36")
private String objectId;
/** 年度1资金数额 */
@ApiModelProperty(value = "年度1资金数额", position = 3 )
private BigDecimal yearValue1;
/** 年度2资金数额 */
@ApiModelProperty(value = "年度2资金数额", position = 3 )
private BigDecimal yearValue2;
/** 年度3资金数额 */
@ApiModelProperty(value = "年度3资金数额", position = 3 )
private BigDecimal yearValue3;
/** 年度4资金数额 */
@ApiModelProperty(value = "年度4资金数额", position = 3 )
private BigDecimal yearValue4;
/** 年度5资金数额 */
@ApiModelProperty(value = "年度5资金数额", position = 3 )
private BigDecimal yearValue5;
/** 总金额 */
@ApiModelProperty(value = "总金额", position = 3)
private BigDecimal totalAmount;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectManagementRuleQueryVO.java deleted 100644 → 0
View file @ cf27ed15
package com.yiboshi.science.param.query;
import com.yiboshi.science.base.PaginationVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.math.BigDecimal;
import java.util.Date;
/**
* 单位科研项目及资金管理制度表VO
*
* @author lkl
* @version 2021-08-26
*/
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "单位科研项目及资金管理制度表VO")
public class ComProjectManagementRuleQueryVO extends PaginationVO{
/** 对象Id（项目Id/任务书Id） */
@ApiModelProperty(value = "对象Id（项目Id/任务书Id）", position = 1 )
@Length(max=36, message = "对象Id（项目Id/任务书Id）不能大于36")
private String objectId;
/** 单位政策名称 */
@ApiModelProperty(value = "单位政策名称", position = 2 )
@Length(max=100, message = "单位政策名称不能大于100")
private String policyName;
/** 出台日期 */
@ApiModelProperty(value = "出台日期", position = 2 )
private Date releaseDate;
/** 文号 */
@ApiModelProperty(value = "文号", position = 3 )
@Length(max=100, message = "文号不能大于100")
private String documentNumber;
/** 有效期 */
@ApiModelProperty(value = "有效期", position = 2 )
private Date validityPeriod;
/** 主要内容 */
@ApiModelProperty(value = "主要内容", position = 4 )
@Length(max=200, message = "在项目中的分工不能大于200")
private String mainContent;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
/** 附件Id */
@ApiModelProperty(value = "附件Id", position = 4 )
private String fileId;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/query/SystemUserQueryVO.java deleted 100644 → 0
View file @ cf27ed15
package com.yiboshi.science.param.query;
import com.yiboshi.science.base.PaginationVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
/**
* 查询用户信息表VO
*
* @author lkl
* @version 2021-08-26
*/
@Data
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "查询用户信息表VO")
public class SystemUserQueryVO extends PaginationVO{
/** 用户名 */
@ApiModelProperty(value = "用户名", position = 1)
private String username;
/** 密码 */
@ApiModelProperty(value = "密码", position = 2)
private String password;
/** 登录名 */
@ApiModelProperty(value = "登录名", position = 3)
private String loginName;
/** 用户Id */
@ApiModelProperty(value = "用户Id", position = 4)
private String personId;
/** 人员编码 */
@ApiModelProperty(value = "人员编码", position = 22)
private String personCode;
/** 用户类型 */
@ApiModelProperty(value = "用户类型", position = 5)
private Integer userType;
/** 状态 */
@ApiModelProperty(value = "状态", position = 6)
private Integer noteState;
/** 角色Id */
@ApiModelProperty(value = "角色Id", position = 7)
private Integer roleId;
/** 单位Id */
@ApiModelProperty(value = "单位Id", position = 19)
@Length(max=36, message = "单位Id不能大于36")
private String unitId;
/** 姓名 */
private String personName;
/** 证件号 */
@ApiModelProperty(value = "证件号", position = 2)
private String certId;
/** 性别 */
@ApiModelProperty(value = "性别", position = 5)
private String sex;
/** 手机号 */
@ApiModelProperty(value = "手机号", position = 5)
private String mobile;
}
\ No newline at end of file
science-admin/src/main/resources/mapper/ComProjectDAO.xml
View file @ aa1d270f
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
ic.proj_id,ic.job_time,ic.main_research_areas,ic.address, ic.proj_id,ic.job_time,ic.main_research_areas,ic.address,
ic.unit_link_name,ic.unit_link_mobile,ic.unit_link_email,ic.unit_link_fax,ic.subject_scope,ic.proj_abstract,ic.proj_keywords, ic.unit_link_name,ic.unit_link_mobile,ic.unit_link_email,ic.unit_link_fax,ic.subject_scope,ic.proj_abstract,ic.proj_keywords,
ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding, ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,
ic.proj_content, ic.research_content,ic.technology_target, ic.economy_target, ic.achievement_target, ic.technology_reports_target, ic.other_target,
ic.proj_attribute,ic.remark,ic.year_target,ic.year1_goal,ic.year2_goal,ic.year3_goal, ic.proj_attribute,ic.remark,ic.year_target,ic.year1_goal,ic.year2_goal,ic.year3_goal,
c.id download_id,c.download_url,c.file_name c.id download_id,c.download_url,c.file_name
from com_project a from com_project a
......
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