111

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

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)

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);