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 e191ee625955eee2dab7647389448fec6a17ac02..df457535fca7e9eafa5a0932b90f521b8acdcfee 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
@@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -20,7 +21,6 @@ import java.util.Date;
@EqualsAndHashCode(callSuper=true)
@ApiModel(description = "项目组成员表VO")
public class ComProjectMembers extends BaseEntity {
-
/** 对象Id(项目Id/任务书Id) */
@ApiModelProperty(value = "对象Id(项目Id/任务书Id)", position = 1 )
@Length(max=36, message = "对象Id(项目Id/任务书Id)不能大于36")
@@ -29,10 +29,6 @@ public class ComProjectMembers extends BaseEntity {
@ApiModelProperty(value = "姓名", position = 2 )
@Length(max=60, message = "姓名不能大于60")
private String name;
- /** 证件号 */
- @ApiModelProperty(value = "证件号", position = 1)
- @Length(max=100, message = "证件号不能大于100")
- private String certId;
/** 性别 */
@ApiModelProperty(value = "性别", position = 4 )
@Length(max=2, message = "性别不能大于2")
@@ -41,49 +37,66 @@ public class ComProjectMembers extends BaseEntity {
@ApiModelProperty(value = "出生年月", position = 3 )
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date birthday;
- /** 年龄 */
- @ApiModelProperty(value = "年龄", position = 5 )
- private Integer age;
- /** 职务 */
- @ApiModelProperty(value = "职务", position = 9 )
- @Length(max=36, message = "职务不能大于36")
- private String duty;
- /** 学历 */
- @ApiModelProperty(value = "学历", position = 8)
- @Length(max=36, message = "学历不能大于36")
- private String education;
+ /** 证书类型 */
+ @ApiModelProperty(value = "证书类型", position = 1)
+ @Length(max=36, message = "证书类型不能大于36")
+ private String certificateType;
+ /** 证件号 */
+ @ApiModelProperty(value = "证件号", position = 1)
+ @Length(max=100, message = "证件号不能大于100")
+ private String certId;
+
+ /** 民族 */
+ @ApiModelProperty(value = "民族", position = 9 )
+ @Length(max=36, message = "民族不能大于36")
+ private String nation;
+ /** 国别或地区 */
+ @ApiModelProperty(value = "国别或地区", position = 9 )
+ @Length(max=50, message = "国别或地区不能大于50")
+ private String country;
+ /** 工作单位 */
+ @ApiModelProperty(value = "工作单位", position = 7 )
+ @Length(max=100, message = "工作单位不能大于100")
+ private String workUnit;
/** 职称 */
@ApiModelProperty(value = "职称", position = 5 )
@Length(max=36, message = "职称不能大于36")
private String title;
- /** 学位 */
- @ApiModelProperty(value = "学位", position = 4 )
- @Length(max=36, message = "学位不能大于36")
+ /** 最高学位 */
+ @ApiModelProperty(value = "最高学位", position = 5 )
+ @Length(max=36, message = "最高学位不能大于36")
private String degree;
- /** 专业 */
- @ApiModelProperty(value = "专业", position = 11)
- @Length(max=36, message = "专业不能大于36")
- private String spec;
- /** 工作单位 */
- @ApiModelProperty(value = "工作单位", position = 7 )
- @Length(max=200, message = "工作单位不能大于200")
- private String workUnit;
- /** 研究方向 */
- @ApiModelProperty(value = "研究方向", position = 6 )
- @Length(max=200, message = "研究方向不能大于200")
- private String researchDirection;
+ /** 电子邮箱 */
+ @ApiModelProperty(value = "电子邮箱", position = 8)
+ @Length(max=100, message = "学历不能大于100")
+ private String email;
+ /** 手机 */
+ @ApiModelProperty(value = "职务", position = 9 )
+ @Length(max=36, message = "职务不能大于36")
+ private String mobile;
+ /** 电话 */
+ @ApiModelProperty(value = "职务", position = 9 )
+ @Length(max=36, message = "职务不能大于36")
+ private String telephone;
+ /** 传真 */
+ @ApiModelProperty(value = "职务", position = 9 )
+ @Length(max=36, message = "职务不能大于36")
+ private String fax;
/** 项目分工 */
@ApiModelProperty(value = "项目分工", position = 8 )
@Length(max=300, message = "项目分工不能大于300")
private String projWork;
- /** 年参加月数 */
- @ApiModelProperty(value = "年参加月数", position = 9 )
- private Integer forMonths;
+ /** 每年工作（月）*/
+ @ApiModelProperty(value = "每年工作（月）", position = 9 )
+ private BigDecimal forMonths;
+ /** 从事专业 */
+ @ApiModelProperty(value = "专业", position = 11)
+ @Length(max=36, message = "专业不能大于36")
+ private String spec;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
/** 角色 1项目负责人 2一般成员 */
@ApiModelProperty(value = "角色 1项目负责人 2一般成员", position = 11 )
private Integer role;
-
}
\ No newline at end of file
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 549f22b74b95472da15a14d0682736e3314d57ad..84464ddd46e940f3e03b672785735502cc4bd7f2 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
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
import java.util.Date;
@@ -21,15 +22,23 @@ import java.util.Date;
public class ComProjectMembersDTO 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=60, message = "姓名不能大于60")
private String name;
+ /** 证书类型 */
+ @ApiModelProperty(value = "证书类型", position = 1)
+ @Length(max=36, message = "证书类型不能大于36")
+ private String certificateType;
/** 证件号 */
@ApiModelProperty(value = "证件号", position = 1)
+ @Length(max=100, message = "证件号不能大于100")
private String certId;
/** 性别 */
@ApiModelProperty(value = "性别", position = 4 )
+ @Length(max=2, message = "性别不能大于2")
private String sex;
/** 出生年月 */
@ApiModelProperty(value = "出生年月", position = 3 )
@@ -38,33 +47,49 @@ public class ComProjectMembersDTO extends BaseDTO {
/** 年龄 */
@ApiModelProperty(value = "年龄", position = 5 )
private Integer age;
- /** 职务 */
- @ApiModelProperty(value = "职务", position = 9 )
- private String duty;
- /** 学历 */
- @ApiModelProperty(value = "学历", position = 8)
- private String education;
- /** 专业 */
- @ApiModelProperty(value = "专业", position = 11)
- private String spec;
- /** 职称 */
- @ApiModelProperty(value = "职称", position = 5 )
- private String title;
- /** 学位 */
- @ApiModelProperty(value = "学位", position = 4 )
- private String degree;
+ /** 民族 */
+ @ApiModelProperty(value = "民族", position = 9 )
+ @Length(max=36, message = "民族不能大于36")
+ private String nation;
+ /** 国别或地区 */
+ @ApiModelProperty(value = "国别或地区", position = 9 )
+ @Length(max=50, message = "国别或地区不能大于50")
+ private String country;
/** 工作单位 */
@ApiModelProperty(value = "工作单位", position = 7 )
+ @Length(max=100, message = "工作单位不能大于100")
private String workUnit;
- /** 研究方向 */
- @ApiModelProperty(value = "研究方向", position = 6 )
- private String researchDirection;
+ /** 职称 */
+ @ApiModelProperty(value = "职称", position = 5 )
+ @Length(max=36, message = "职称不能大于36")
+ private String title;
+ /** 电子邮箱 */
+ @ApiModelProperty(value = "电子邮箱", position = 8)
+ @Length(max=100, message = "学历不能大于100")
+ private String email;
+ /** 手机 */
+ @ApiModelProperty(value = "职务", position = 9 )
+ @Length(max=36, message = "职务不能大于36")
+ private String mobile;
+ /** 电话 */
+ @ApiModelProperty(value = "职务", position = 9 )
+ @Length(max=36, message = "职务不能大于36")
+ private String telephone;
+ /** 传真 */
+ @ApiModelProperty(value = "职务", position = 9 )
+ @Length(max=36, message = "职务不能大于36")
+ private String fax;
/** 项目分工 */
@ApiModelProperty(value = "项目分工", position = 8 )
+ @Length(max=300, message = "项目分工不能大于300")
private String projWork;
- /** 年参加月数 */
- @ApiModelProperty(value = "年参加月数", position = 9 )
+ /** 每年工作（月）*/
+ @ApiModelProperty(value = "每年工作（月）", position = 9 )
private Integer forMonths;
+ /** 从事专业 */
+ @ApiModelProperty(value = "专业", position = 11)
+ @Length(max=36, message = "专业不能大于36")
+ private String spec;
/** 排序 */
@ApiModelProperty(value = "排序", position = 10 )
private Integer showIndex;
@@ -88,7 +113,6 @@ public class ComProjectMembersDTO extends BaseDTO {
@ApiModelProperty(value = "学历", position = 8)
private String educationName;
-
/** 项目组成员_总人数 */
@ApiModelProperty(value = "项目组成员_总人数", position = 17 )
private Integer memCount;
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 fb24efe91db96c0465b087c4c8b2a7e17e9269db..6035f5da578d56a2b1b9158b1df46ff44b39d6c7 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
@@ -243,17 +243,17 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
projType = CommonEnum.projType.num.getCode();
}
//申报单位
- ComUnitDTO comUnitDTO = comUnitService.dtoById(SecurityUserHolder.getUnitId());
+ ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
if (null != comUnitDTO) {
dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
- dto.setOrganizationCode(comUnitDTO.getUnitAddress());
+ dto.setOrganizationCode(null);
dto.setAddress(comUnitDTO.getUnitAddress());
- dto.setLegalPerson(comUnitDTO.getUnitAddress());
- dto.setDepositBank(comUnitDTO.getUnitAddress());
- dto.setBankAccount(comUnitDTO.getUnitAddress());
- dto.setDepositBankAddress(comUnitDTO.getUnitAddress());
- dto.setInterbankNumber(comUnitDTO.getUnitAddress());
+ dto.setLegalPerson(null);
+ dto.setDepositBank(null);
+ dto.setBankAccount(null);
+ dto.setDepositBankAddress(null);
+ dto.setInterbankNumber(null);
}
//经费表
List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getList(projType);
@@ -290,13 +290,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
if (null != comUnitDTO) {
dto.setAppUnitName(comUnitDTO.getUnitName());
dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
- dto.setOrganizationCode(comUnitDTO.getUnitAddress());
+ dto.setOrganizationCode(null);
dto.setAddress(comUnitDTO.getUnitAddress());
- dto.setLegalPerson(comUnitDTO.getUnitAddress());
- dto.setDepositBank(comUnitDTO.getUnitAddress());
- dto.setBankAccount(comUnitDTO.getUnitAddress());
- dto.setDepositBankAddress(comUnitDTO.getUnitAddress());
- dto.setInterbankNumber(comUnitDTO.getUnitAddress());
+ dto.setLegalPerson(null);
+ dto.setDepositBank(null);
+ dto.setBankAccount(null);
+ dto.setDepositBankAddress(null);
+ dto.setInterbankNumber(null);
}
// 项目合作单位