diff --git a/science-admin/src/main/java/com/yiboshi/science/entity/ComUnit.java b/science-admin/src/main/java/com/yiboshi/science/entity/ComUnit.java index 19558e74e48159ffa0b8a0a01079b245ddf46557..3fadb4d01f95d794f67d3cb563e286f1ef59442b 100644 --- a/science-admin/src/main/java/com/yiboshi/science/entity/ComUnit.java +++ b/science-admin/src/main/java/com/yiboshi/science/entity/ComUnit.java @@ -91,4 +91,8 @@ public class ComUnit extends BaseEntity { @ApiModelProperty(value = "审核时间", position = 7 ) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date auditDate; + /** 组织机构代码/统一社会信用代码 */ + @ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 ) + @Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50") + private String organizationCode; } \ No newline at end of file diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java index 8b1d1592f89d8eb34db74bad069101bfa8e2758f..7c9eb258d4184d33e62be6bc8e11b4f1366b23ea 100644 --- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java +++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComUnitDTO.java @@ -71,6 +71,10 @@ public class ComUnitDTO extends BaseDTO { @ApiModelProperty(value = "审核时间", position = 7 ) @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date auditDate; + /** 组织机构代码/统一社会信用代码 */ + @ApiModelProperty(value = "组织机构代码/统一社会信用代码", position = 1 ) + @Length(max=50, message = "组织机构代码/统一社会信用代码不能大于50") + private String organizationCode; /** 单位类型 */ @ApiModelProperty(value = "单位类型", position = 14) 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 f95c8916b6a837e34e9c5947dd5af508b7157db1..c440b48803afdb5837bc2dd08a1ca8199204507b 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 @@ -253,7 +253,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro if (null != comUnitDTO) { dto.setAppUnitName(comUnitDTO.getUnitName()); dto.setUnitTypeName(comUnitDTO.getUnitTypeName()); - dto.setOrganizationCode(null); + dto.setOrganizationCode(comUnitDTO.getOrganizationCode()); dto.setAddress(comUnitDTO.getUnitAddress()); dto.setLegalPerson(null); dto.setDepositBank(null); @@ -300,7 +300,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro if (null != comUnitDTO) { dto.setAppUnitName(comUnitDTO.getUnitName()); dto.setUnitTypeName(comUnitDTO.getUnitTypeName()); -// dto.setOrganizationCode(null); +// dto.setOrganizationCode(comUnitDTO.getOrganizationCode()); // dto.setAddress(comUnitDTO.getUnitAddress()); // dto.setLegalPerson(null); // dto.setDepositBank(null);