Skip to content

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

111

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