diff --git a/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectCooperativeUnitsDAO.java b/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectCooperativeUnitsDAO.java
index 34c5125523eeae176f262bfbd414d6d71c44a651..6fb0acb3bbcee9bc60871f066ef35afede31e05c 100644
--- a/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectCooperativeUnitsDAO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/dao/ComProjectCooperativeUnitsDAO.java
@@ -15,5 +15,5 @@ import java.util.List;
* @version 2021-08-26
*/
public interface ComProjectCooperativeUnitsDAO extends BaseMapper<ComProjectCooperativeUnits>, BaseDAO<ComProjectCooperativeUnitsQueryVO,ComProjectCooperativeUnitsDTO, ComProjectCooperativeUnits> {
- List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId);
+ List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId, int type);
}
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComPerson.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComPerson.java
index dfa6afbcf5fc77994bd290fecd5d6747811fc477..3735d577ae339a95e37d536562b3b57134fcb83f 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComPerson.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComPerson.java
@@ -116,6 +116,11 @@ public class ComPerson extends BaseEntity {
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
private String remark;
+ /** 主要研究领域 */
+ @ApiModelProperty(value = "主要研究领域", position = 19 )
+ @Length(max=200, message = "主要研究领域不能大于200")
+ private String mainResearchAreas;
+
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 25)
private Integer auditResult;
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java
index ad6ba96a0ff985142416fe2eab87c4fb5508c882..22f66d2c950c109f739121e7bac32488ec4d0c65 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java
@@ -63,7 +63,7 @@ public class ComProject extends BaseEntity {
private Integer projType;
/** 项目类别 */
@ApiModelProperty(value = "项目类别", position = 3 )
- @Length(max=36, message = "项目类别不能大于36")
+ @Length(max=100, message = "项目类别不能大于100")
private String projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
index 4768c6b94a9d3eca4520c04d243fe398561116c6..f9ecd886b5b751f0c6fc316740cf93a747519606 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java
@@ -27,14 +27,56 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
private String projId;
- /** 单位名称 */
- @ApiModelProperty(value = "单位名称", position = 1)
- @Length(max=200, message = "单位名称不能大于200")
- private String appUnitName;
- /** 注册单位类型 */
- @ApiModelProperty(value = "注册单位类型", position = 1)
- @Length(max=36, message = "注册单位类型不能大于36")
- private String unitType;
+
+ /** 每年工作时间(月) */
+ @ApiModelProperty(value = "每年工作时间(月)", position = 1 )
+ private Integer jobTime;
+ /** 主要研究领域 */
+ @ApiModelProperty(value = "主要研究领域", position = 19 )
+ @Length(max=200, message = "主要研究领域不能大于200")
+ private String mainResearchAreas;
+
+
+ /** 单位联系人姓名 */
+ @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 = 38 )
+ @Length(max=65535, message = "备注不能大于65535")
+ private String remark;
+
+ /** 项目摘要 */
+ @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 = 1 )
@Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50")
@@ -42,7 +84,7 @@ public class ComProjectBasic extends BaseEntity {
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
- private String address;
+ private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
@@ -55,7 +97,6 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
-
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
@@ -65,7 +106,6 @@ public class ComProjectBasic extends BaseEntity {
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
-
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
@@ -82,10 +122,11 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
-
/** 上年度研发经费支出总额(单位:万元) */
@ApiModelProperty(value = "上年度研发经费支出总额(单位:万元)", position = 1 )
private BigDecimal researchTotal;
+
+
/** 上年度是否填报了研发活动情况 0 否 1 是 */
@ApiModelProperty(value = "上年度是否填报了研发活动情况", position = 1 )
private Integer isResearchActive;
@@ -96,6 +137,7 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "上一年度填报的研发人员数", position = 1 )
private Integer researchPersonCount;
+
/** 项目所属二级学院/部门名称(牵头单位) */
@ApiModelProperty(value = "项目所属二级学院/部门名称(牵头单位)", position = 1 )
@Length(max=100, message = "项目所属二级学院/部门名称(牵头单位)不能大于100")
@@ -109,7 +151,6 @@ public class ComProjectBasic extends BaseEntity {
@Length(max=100, message = "项目依托的科技创新基地不能大于100")
private String technologyInnovationBase;
-
/** 项目总经费(万元） */
@ApiModelProperty(value = "项目总经费(万元）", position = 39)
private BigDecimal totalFunding;
@@ -126,6 +167,7 @@ public class ComProjectBasic extends BaseEntity {
@ApiModelProperty(value = "其他", position = 43)
private BigDecimal otherFunding;
+
/** 项目联系人姓名 */
@ApiModelProperty(value = "项目联系人姓名", position = 16)
@Length(max=100, message = "项目联系人姓名不能大于100")
@@ -143,14 +185,6 @@ public class ComProjectBasic extends BaseEntity {
@Length(max=100, message = "传真不能大于100")
private String linkFax;
- /** 项目摘要 */
- @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 = 13 )
@@ -226,9 +260,4 @@ public class ComProjectBasic extends BaseEntity {
@Length(max=500, message = "第三年目标500")
private String year3Goal;
-
- /** 备注 */
- @ApiModelProperty(value = "备注", position = 38 )
- @Length(max=65535, message = "备注不能大于65535")
- private String remark;
}
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectCooperativeUnits.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectCooperativeUnits.java
index 6e40586536dd421a989fe6a315b6c07d72bf7c1a..db8263b3adab7dbb1fb30b3dbb44027093e2a763 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectCooperativeUnits.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectCooperativeUnits.java
@@ -42,6 +42,9 @@ public class ComProjectCooperativeUnits extends BaseEntity {
@ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork;
+ /** 类型 */
+ @ApiModelProperty(value = "类型", position = 10 )
+ private Integer type;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectMembers.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectMembers.java
index df457535fca7e9eafa5a0932b90f521b8acdcfee..7bf31e7d66d0b83d690c4a6dc9409522bf10bc5f 100644
--- a/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectMembers.java
+++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComProjectMembers.java
@@ -99,4 +99,7 @@ public class ComProjectMembers extends BaseEntity {
/** 角色 1项目负责人 2一般成员 */
@ApiModelProperty(value = "角色 1项目负责人 2一般成员", position = 11 )
private Integer role;
+ /** 附件Id */
+ @ApiModelProperty(value = "附件Id", position = 4 )
+ private String fileId;
}
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComPersonDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComPersonDTO.java
index 3a26b6c7fa4579efaabb9f69b18c99f82bcd141b..695a31d8bfa2e482578f80678ca3597e06d3fd60 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComPersonDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComPersonDTO.java
@@ -95,6 +95,12 @@ public class ComPersonDTO extends BaseDTO {
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
private String remark;
+
+ /** 主要研究领域 */
+ @ApiModelProperty(value = "主要研究领域", position = 19 )
+ @Length(max=200, message = "主要研究领域不能大于200")
+ private String mainResearchAreas;
+
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 25)
private Integer auditResult;
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
index 554b0ca2c305a91d1cfad873b93c4fb1b186c71b..728529b7c6fd02d91b08e680313f3828571ad003 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java
@@ -26,6 +26,16 @@ public class ComProjectBasicDTO extends BaseDTO {
@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=300, message = "主要研究领域不能大于300")
+ private String mainResearchAreas;
+
+
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 1)
@Length(max=200, message = "单位名称不能大于200")
@@ -41,7 +51,7 @@ public class ComProjectBasicDTO extends BaseDTO {
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
- private String address;
+ private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
@@ -54,7 +64,6 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
-
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
@@ -64,7 +73,6 @@ public class ComProjectBasicDTO extends BaseDTO {
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
-
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
@@ -81,6 +89,23 @@ public class ComProjectBasicDTO extends BaseDTO {
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
+ /** 单位联系人姓名 */
+ @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 )
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectCooperativeUnitsDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectCooperativeUnitsDTO.java
index 66aa5bf9b3f0359f297c9f4d5de46423ee855ae2..a3a9d626a6add7ef32cb87f190f3fb463da24a9f 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectCooperativeUnitsDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectCooperativeUnitsDTO.java
@@ -41,6 +41,9 @@ public class ComProjectCooperativeUnitsDTO extends BaseDTO {
@ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork;
+ /** 类型 */
+ @ApiModelProperty(value = "类型", position = 10 )
+ private Integer type;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
index 9e977bcb050263d3260bcfc83f89c2871bcee618..57be4a920c2e600dbf0cb52f73f20098fdec6706 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
@@ -64,7 +64,7 @@ public class ComProjectDTO extends BaseDTO {
private Integer projType;
/** 项目类别 */
@ApiModelProperty(value = "项目类别", position = 3 )
- @Length(max=36, message = "项目类别不能大于36")
+ @Length(max=100, message = "项目类别不能大于100")
private String projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
@@ -96,6 +96,20 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
private String projId;
+ /** 每年工作时间(月) */
+ @ApiModelProperty(value = "每年工作时间(月)", position = 1 )
+ private Integer jobTime;
+ /** 通讯地址 */
+ @ApiModelProperty(value = "通讯地址", position = 1)
+ @Length(max=200, message = "通讯地址不能大于200")
+ private String address;
+ /** 主要研究领域 */
+ @ApiModelProperty(value = "主要研究领域", position = 19 )
+ @Length(max=200, message = "主要研究领域不能大于200")
+ private String mainResearchAreas;
+
+
+
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 1)
@Length(max=200, message = "单位名称不能大于200")
@@ -111,7 +125,7 @@ public class ComProjectDTO extends BaseDTO {
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
- private String address;
+ private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
@@ -124,7 +138,6 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
-
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1)
private Integer workforce;
@@ -134,7 +147,6 @@ public class ComProjectDTO extends BaseDTO {
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
-
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
@@ -151,6 +163,22 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
+ /** 单位联系人姓名 */
+ @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 )
@@ -335,22 +363,6 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "注册单位类型", position = 12)
@Length(max=100, message = "注册单位类型不能大于100")
private String unitTypeName;
- /** 项目联系人姓名 */
- @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 = 41)
@@ -379,16 +391,24 @@ public class ComProjectDTO extends BaseDTO {
private String sex;
/** 出生年月 */
@ApiModelProperty(value = "出生年月", position = 3)
- private String birthday;
+ private Date birthday;
/** 证件号 */
@ApiModelProperty(value = "证件号", position = 3)
private String certId;
+ /** 邮箱 */
+ @ApiModelProperty(value = "邮箱", position = 15)
+ private String email;
+ /** 电话号码 */
+ @ApiModelProperty(value = "电话号码", position = 16)
+ private String mobile;
/** 民族 */
@ApiModelProperty(value = "民族", position = 3)
private String nationName;
/** 职称 */
@ApiModelProperty(value = "职称", position = 3)
private String titleName;
+ @ApiModelProperty(value = "职务", position = 12)
+ private String dutyName;
/** 学位 */
@ApiModelProperty(value = "学位", position = 8)
private String degreeName;
@@ -404,6 +424,8 @@ public class ComProjectDTO extends BaseDTO {
/** 合作单位 */
private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
+ /** 项目主要参与单位 */
+ private List<ComProjectCooperativeUnitsDTO> participateUnits;
/** 项目组成员 */
private List<ComProjectMembersDTO> members;
/** 经费表 */
@@ -417,7 +439,6 @@ public class ComProjectDTO extends BaseDTO {
/** 项目绩效目标表 */
private ProjectKPIStatisticDTO projectKPI;
-
/** 项目经费构成表 */
private List<ComProjectFundCompositionDTO> fundCompositions;
/** 在研或完成基础研究项目情况 */
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectMembersDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectMembersDTO.java
index 315dcd9a3e3356138d60d591e60956294d74d951..3b2a52b91a7afcbf81227305cc88296c621deb78 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectMembersDTO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectMembersDTO.java
@@ -99,6 +99,19 @@ public class ComProjectMembersDTO extends BaseDTO {
/** 角色 1项目负责人 2一般成员 */
@ApiModelProperty(value = "角色 1项目负责人 2一般成员", position = 11 )
private Integer role;
+ /** 附件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;
/** 证件类型 */
@ApiModelProperty(value = "证件类型", position = 9)
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComPersonQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComPersonQueryVO.java
index 0f308425628c01a8a972118522b379d9d755c08e..535e9ac0961f045fe9e002bd4b9d6e1dbb75898a 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComPersonQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComPersonQueryVO.java
@@ -95,6 +95,12 @@ public class ComPersonQueryVO extends PaginationVO {
@ApiModelProperty(value = "备注", position = 19 )
@Length(max=200, message = "备注不能大于200")
private String remark;
+
+ /** 主要研究领域 */
+ @ApiModelProperty(value = "主要研究领域", position = 19 )
+ @Length(max=200, message = "主要研究领域不能大于200")
+ private String mainResearchAreas;
+
/** 1 待审核，10 审核通过， 20 审核不通过 ，30 返回修改 */
@ApiModelProperty(value = "审核结果", position = 25)
private Integer auditResult;
@@ -112,6 +118,9 @@ public class ComPersonQueryVO extends PaginationVO {
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditDate;
+
+
+
/** 二级专业Id */
@ApiModelProperty(value = "二级专业Id", position = 39)
private String specParentId;
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java
index 12d73f866fafa50a15a08ff31d3cb4cf667bc633..45e142453476566762434e5f264e40ff63697ef5 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java
@@ -25,6 +25,21 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
private String projId;
+
+ /** 选题范围 */
+ @ApiModelProperty(value = "选题范围", position = 1 )
+ @Length(max=200, message = "主要研究领域不能大于200")
+ private String subjectScope;
+
+ /** 每年工作时间(月) */
+ @ApiModelProperty(value = "每年工作时间(月)", position = 1 )
+ private Integer jobTime;
+
+ /** 主要研究领域 */
+ @ApiModelProperty(value = "主要研究领域", position = 19 )
+ @Length(max=200, message = "主要研究领域不能大于200")
+ private String mainResearchAreas;
+
/** 单位名称 */
@ApiModelProperty(value = "单位名称", position = 1)
@Length(max=200, message = "单位名称不能大于200")
@@ -40,7 +55,7 @@ public class ComProjectBasicQueryVO extends PaginationVO{
/** 通讯地址 */
@ApiModelProperty(value = "通讯地址", position = 1)
@Length(max=200, message = "通讯地址不能大于200")
- private String address;
+ private String unitAddress;
/** 注册所在地 */
@ApiModelProperty(value = "注册所在地", position = 1 )
@Length(max=50, message = "注册所在地不能大于50")
@@ -53,7 +68,6 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value = "法定代表人", position = 1 )
@Length(max=50, message = "法定代表人不能大于50")
private String legalPerson;
-
/** 职工总数 */
@ApiModelProperty(value = "职工总数", position = 1 )
private Integer workforce;
@@ -63,7 +77,6 @@ public class ComProjectBasicQueryVO extends PaginationVO{
/** 研究开发人员 */
@ApiModelProperty(value = "研究开发人员", position = 1 )
private Integer researchPersonnel;
-
/** 开户银行 */
@ApiModelProperty(value = "开户银行", position = 1 )
@Length(max=100, message = "开户银行不能大于100")
@@ -80,6 +93,22 @@ public class ComProjectBasicQueryVO extends PaginationVO{
@ApiModelProperty(value = "银行联行号", position = 1 )
@Length(max=50, message = "银行联行号不能大于50")
private String interbankNumber;
+ /** 单位联系人姓名 */
+ @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 )
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectCooperativeUnitsQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectCooperativeUnitsQueryVO.java
index 8cbbd2da616f94ebba73b4e9297667c41a7be212..921daeff0a72c9bb42737a426a57cb6a9b291eeb 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectCooperativeUnitsQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectCooperativeUnitsQueryVO.java
@@ -41,6 +41,9 @@ public class ComProjectCooperativeUnitsQueryVO extends PaginationVO{
@ApiModelProperty(value = "在项目中的分工", position = 4 )
@Length(max=300, message = "在项目中的分工不能大于300")
private String projectWork;
+ /** 类型 */
+ @ApiModelProperty(value = "类型", position = 10 )
+ private Integer type;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectMembersQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectMembersQueryVO.java
index 86c4ef827cb2f5259349617c52f9c8ac0acc732b..4370729039a3b222a98cd33f872d34b86d05d5b8 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectMembersQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectMembersQueryVO.java
@@ -84,4 +84,7 @@ public class ComProjectMembersQueryVO extends PaginationVO{
/** 角色 1项目负责人 2一般成员 */
@ApiModelProperty(value = "角色 1项目负责人 2一般成员", position = 11 )
private Integer role;
+ /** 附件Id */
+ @ApiModelProperty(value = "附件Id", position = 4 )
+ private String fileId;
}
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java
index dcad6a25ec8ea5ce70d3160596859609774e5192..c908f87bb1054c350bba083b55b3ba605e0896b6 100644
--- a/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java
+++ b/science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java
@@ -63,7 +63,7 @@ public class ComProjectQueryVO extends PaginationVO{
private Integer projType;
/** 项目类别 */
@ApiModelProperty(value = "项目类别", position = 3 )
- @Length(max=36, message = "项目类别不能大于36")
+ @Length(max=100, message = "项目类别不能大于100")
private String projClass;
/** 项目开始时间 */
@ApiModelProperty(value = "项目开始时间", position = 10 )
@@ -90,7 +90,6 @@ public class ComProjectQueryVO extends PaginationVO{
@ApiModelProperty(value = "平均分", position = 4)
private BigDecimal averageScore;
-
/** 项目Id */
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java
index d785d15049382ad25c60aff81b020115d5a0933c..69c5cd899ddfe1f85d61dc5c7544766774ae7817 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/ComProjectCooperativeUnitsService.java
@@ -18,7 +18,7 @@ public interface ComProjectCooperativeUnitsService extends BaseService<ComProjec
* @param objectId
* @return
*/
- List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId);
+ List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId, int type);
/** 删除对象列表
*
* @param objectId
@@ -29,5 +29,5 @@ public interface ComProjectCooperativeUnitsService extends BaseService<ComProjec
* @param list
* @param objectId
*/
- void insertList(List<ComProjectCooperativeUnitsDTO> list, String objectId);
+ void insertList(List<ComProjectCooperativeUnitsDTO> list, String objectId, int type);
}
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java
index eac23c7c821f64c3a81bcd24e8cd731c5881ac5e..0d15f098dc3406d0149f656cb104cdb227192a78 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectCooperativeUnitsServiceImpl.java
@@ -43,19 +43,14 @@ public class ComProjectCooperativeUnitsServiceImpl extends BaseServiceImpl<ComPr
}
}
- public List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId) {
- return comProjectCooperativeUnitsDAO.getListByObjectId(objectId);
+ public List<ComProjectCooperativeUnitsDTO> getListByObjectId(String objectId, int type) {
+ return comProjectCooperativeUnitsDAO.getListByObjectId(objectId,type);
}
- public void deleteByObjectId(String objectId) {
- ComProjectCooperativeUnits model = new ComProjectCooperativeUnits();
- model.setObjectId(objectId);
- this.delete(model);
- }
-
- public void insertList(List<ComProjectCooperativeUnitsDTO> list, String objectId) {
+ public void insertList(List<ComProjectCooperativeUnitsDTO> list, String objectId, int type) {
ComProjectCooperativeUnits model = new ComProjectCooperativeUnits();
model.setObjectId(objectId);
+ model.setType(type);
this.delete(model);
if (null != list) {
List<ComProjectCooperativeUnits> iList = new ArrayList<>();
@@ -68,4 +63,12 @@ public class ComProjectCooperativeUnitsServiceImpl extends BaseServiceImpl<ComPr
this.insertBatch(iList);
}
}
+
+ public void deleteByObjectId(String objectId) {
+ ComProjectCooperativeUnits model = new ComProjectCooperativeUnits();
+ model.setObjectId(objectId);
+ this.delete(model);
+ }
+
+
}
\ No newline at end of file
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
index a5daa4fc24752661d6e3c54fed2bcdc09d5ba70b..f70726ce0e959304b8f26853e671050dc17b25a5 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
@@ -278,6 +278,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
dto.setInterbankNumber(comUnitDTO.getInterbankNumber());
}
+
+ // 申报人
+ ComPersonDTO comPersonDTO = comPersonService.getPersonById(SecurityUserHolder.getPersonId());
+ if (null != comPersonDTO) {
+ loadPersonInfo(dto, comPersonDTO);
+ }
+
//经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
dto.setBudget(budgetList);
@@ -329,9 +336,14 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
// 项目合作单位
- List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId());
+ List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(),1);
dto.setCooperativeUnits(cooperativeUnits);
+ // 项目主要参与单位
+ List<ComProjectCooperativeUnitsDTO> participateUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(),2);
+ dto.setCooperativeUnits(participateUnits);
+
+
//获取项目组成员
List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
dto.setMembers(memList);
@@ -535,14 +547,15 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
private void loadPersonInfo(ComProjectDTO dto, ComPersonDTO comPersonDTO) {
dto.setAppPersonName(comPersonDTO.getPersonName());
dto.setSex(comPersonDTO.getSex());
- SimpleDateFormat time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- dto.setBirthday(time.format(comPersonDTO.getBirthday()));
- dto.setCertId(comPersonDTO.getCertId());
+ dto.setBirthday(comPersonDTO.getBirthday());
dto.setNationName(comPersonDTO.getNationName());
+ dto.setDegreeName(comPersonDTO.getDegreeName());
dto.setTitleName(comPersonDTO.getTitleName());
- dto.setEducationName(comPersonDTO.getEducationName());
+ dto.setDutyName(comPersonDTO.getDuty());
dto.setSpecName(comPersonDTO.getSpecName());
- dto.setJobUnit(comPersonDTO.getUnitName());
+ dto.setAddress(comPersonDTO.getAddress());
+ dto.setMobile(comPersonDTO.getMobile());
+ dto.setEmail(comPersonDTO.getEmail());
}
/**
@@ -725,7 +738,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
String id = this.insert(comProject);
// 项目合作单位
- comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id);
+ comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id,1);
+ // 主要参与单位
+ comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), id);
// 经费预算
@@ -780,7 +795,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// }
// 项目合作单位
- comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), comProject.getId());
+ comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), comProject.getId(),1);
+ // 主要参与单位
+ comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
// 项目参加人员
comProjectMembersService.insertList(dto.getMembers(), comProject.getId());
// 经费预算
diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
index c3e2f903ca1b52a6ae3e5dee217414b5ca3990bf..3f1c2ce7606daea16dd97a6e6d46637be6da246e 100644
--- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
+++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
@@ -168,7 +168,7 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
if (null == test.getBudgetGovCount())
test.setBudgetGovCount(comProject.getTotalFunding());
//合作单位
- List<ComProjectCooperativeUnitsDTO> together = ComProjectCooperativeUnitsService.getListByObjectId(comProject.getId());
+ List<ComProjectCooperativeUnitsDTO> together = ComProjectCooperativeUnitsService.getListByObjectId(comProject.getId(),1);
test.setTogether(together);
//申报单位
ComUnitDTO comUnit = comUnitService.getUnitById(comProject.getAppUnitId());
diff --git a/science-admin/src/main/resources/mapper/ComProjectCooperativeUnitsDAO.xml b/science-admin/src/main/resources/mapper/ComProjectCooperativeUnitsDAO.xml
index 36c6e3307bc68fb8ba9cbe3e5893684d53528a70..a1cc1e35e2c58c5fcb8aeb4d8e4d4768d61dc96f 100644
--- a/science-admin/src/main/resources/mapper/ComProjectCooperativeUnitsDAO.xml
+++ b/science-admin/src/main/resources/mapper/ComProjectCooperativeUnitsDAO.xml
@@ -6,10 +6,10 @@
<sql id="allColumns">
t.id as id, t.object_id as objectId, t.unit_name as unitName, t.unit_address as unitAddress, t.project_work as projectWork
</sql>
- <select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectCooperativeUnitsDTO">
+ <select id="getListByObjectId" parameterType="java.util.Map" resultType="com.yiboshi.science.param.dto.ComProjectCooperativeUnitsDTO">
SELECT
a.*
FROM com_project_cooperative_units a
- where object_id=#{objectId} order by a.show_index asc
+ where object_id=#{objectId} and type=#{type} order by a.show_index asc
</select>
</mapper>
\ No newline at end of file
diff --git a/science-admin/src/main/resources/mapper/ComProjectMembersDAO.xml b/science-admin/src/main/resources/mapper/ComProjectMembersDAO.xml
index f53354d6a59c5c50ad59a7883f6a2ebd825381f4..b57f5de662d881bf8b87d1c754a56d6546b6cf4b 100644
--- a/science-admin/src/main/resources/mapper/ComProjectMembersDAO.xml
+++ b/science-admin/src/main/resources/mapper/ComProjectMembersDAO.xml
@@ -12,12 +12,14 @@
</select>
<select id="getListByObjectId" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectMembersDTO">
SELECT a.*,b.name certificate_type_name,c.name nation_name,d.name title_name,e.name degree_name,f.name spec_name
+ ,g.id download_id,g.download_url,g.file_name
FROM com_project_members a
left join system_parameter b on a.certificate_type=b.id and b.type_id=49
left join system_parameter c on a.nation=c.id and c.type_id=11
left join system_parameter d on a.title = d.id and d.type_id=7
left join system_parameter e on a.degree=e.id and e.type_id=9
left join system_parameter f on a.spec=f.id and f.type_id=42
+ left join com_download g on a.file_id=g.id
where object_id=#{objectId}
order by a.show_index asc
</select>