77

science-admin/src/main/java/com/yiboshi/science/entity/ComProjectBasic.java

@@ -35,6 +35,10 @@ public class ComProjectBasic extends BaseEntity {
     @ApiModelProperty(value = "主要研究领域", position = 19 )
     @Length(max=200, message = "主要研究领域不能大于200")
     private String mainResearchAreas;
+    /** 申报人通信地址 */
+    @ApiModelProperty(value = "申报人通信地址", position = 15 )
+    @Length(max=200, message = "申报人通信地址不能大于200")
+    private String address;
 
     /** 单位联系人姓名 */
     @ApiModelProperty(value = "单位联系人姓名", position = 16)

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectBasicDTO.java

@@ -34,6 +34,10 @@ public class ComProjectBasicDTO extends BaseDTO {
     @ApiModelProperty(value = "主要研究领域", position = 19 )
     @Length(max=200, message = "主要研究领域不能大于200")
     private String mainResearchAreas;
+    /** 申报人通信地址 */
+    @ApiModelProperty(value = "申报人通信地址", position = 15 )
+    @Length(max=200, message = "申报人通信地址不能大于200")
+    private String address;
 
     /** 单位联系人姓名 */
     @ApiModelProperty(value = "单位联系人姓名", position = 16)

science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectBasicQueryVO.java

@@ -33,6 +33,10 @@ public class ComProjectBasicQueryVO extends PaginationVO{
     @ApiModelProperty(value = "主要研究领域", position = 19 )
     @Length(max=200, message = "主要研究领域不能大于200")
     private String mainResearchAreas;
+    /** 申报人通信地址 */
+    @ApiModelProperty(value = "申报人通信地址", position = 15 )
+    @Length(max=200, message = "申报人通信地址不能大于200")
+    private String address;
 
     /** 单位联系人姓名 */
     @ApiModelProperty(value = "单位联系人姓名", position = 16)

science-admin/src/main/java/com/yiboshi/science/rest/v1/AuthorizationController.java

@@ -169,7 +169,8 @@ public class AuthorizationController {
         if(!user.getType().equals("3")){
             user.setProjType(systemSetService.getByKey(SystemSetKey.SysProjectType));
         }
-        user.setComplete(comPersonService.isComplete(SecurityUserHolder.getPersonId()));
+        ComPerson  person = comPersonService.getById(SecurityUserHolder.getPersonId());
+        user.setComplete(comPersonService.isComplete(person));
         List<UserMenuDTO> menuList = systemMenuService.findByRoleId(SecurityUserHolder.getRoles());
         Map<String, Object> userInfo = new HashMap<String, Object>(3) {
             {

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComPersonController.java

@@ -177,17 +177,7 @@ public class ComPersonController extends BaseController<ComPersonService, ComPer
     public ResponseDataModel<Map<String, Object>> getAppPersonInfo() {
         boolean isComplete = true;
         ComPerson comPerson = comPersonService.entityById(SecurityUserHolder.getPersonId());
-        if (null == comPerson)
-            isComplete= false;
-        if (StringUtils.isEmpty(comPerson.getNation()) ||
-                StringUtils.isEmpty(comPerson.getTitle()) ||
-                StringUtils.isEmpty(comPerson.getDegree()) ||
-                StringUtils.isEmpty(comPerson.getEducation()) ||
-                StringUtils.isEmpty(comPerson.getSpec()) ||
-                StringUtils.isEmpty(comPerson.getEmail())) {
-            isComplete= false;
-        }
-        boolean finalComplete = isComplete;
+        boolean finalComplete = comPersonService.isComplete(comPerson);
         Map<String, Object> data = new HashMap<String, Object>(3) {
             {
                 put("person", comPerson);

science-admin/src/main/java/com/yiboshi/science/service/ComPersonService.java

@@ -107,5 +107,5 @@ public interface ComPersonService extends BaseService<ComPersonQueryVO, ComPerso
     DataStatisticsDTO getRegisterPersonCount(ComPersonQueryVO v);
     DataStatisticsDTO getRegisterPersonCountByDay(ComPersonQueryVO v);
 
-    boolean isComplete(String id);
+    boolean isComplete(ComPerson person);
 }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java

@@ -327,15 +327,15 @@ public class ComPersonServiceImpl extends BaseServiceImpl<ComPersonDAO, ComPerso
         return state;
     }
 
-    public boolean isComplete(String id) {
-        ComPerson person = this.getById(id);
+    public boolean isComplete(ComPerson person) {
         if (null == person)
             return false;
-        if (StringUtils.isEmpty(person.getNation()) ||
+        if (StringUtils.isEmpty(person.getPersonName()) ||
+                StringUtils.isEmpty(person.getNation()) ||
                 StringUtils.isEmpty(person.getTitle()) ||
-                StringUtils.isEmpty(person.getDegree()) ||
-                StringUtils.isEmpty(person.getEducation()) ||
                 StringUtils.isEmpty(person.getSpec()) ||
+                StringUtils.isEmpty(person.getDegree()) ||
+                StringUtils.isEmpty(person.getDuty()) ||
                 StringUtils.isEmpty(person.getEmail())) {
             return false;
         }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

@@ -255,8 +255,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
         if (null != comUnitDTO) {
             dto.setAppUnitName(comUnitDTO.getUnitName());
-            dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
-            dto.setAddress(comUnitDTO.getUnitAddress());
 //
 //            dto.setOrganizationCode(comUnitDTO.getOrganizationCode());
 //            dto.setRegisteredAddress(comUnitDTO.getRegisteredAddress());
@@ -283,6 +281,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         ComPersonDTO comPersonDTO = comPersonService.getPersonById(SecurityUserHolder.getPersonId());
         if (null != comPersonDTO) {
             loadPersonInfo(dto, comPersonDTO);
+            dto.setAddress(comPersonDTO.getAddress());
+            dto.setMainResearchAreas(comPersonDTO.getMainResearchAreas());
         }
 
         //经费表
@@ -332,8 +332,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         ComUnitDTO comUnitDTO = comUnitService.getUnitById(dto.getAppUnitId());
         if (null != comUnitDTO) {
             dto.setAppUnitName(comUnitDTO.getUnitName());
-            dto.setUnitTypeName(comUnitDTO.getUnitTypeName());
-            dto.setAddress(comUnitDTO.getUnitAddress());
         }
 
         // 项目合作单位

science-admin/src/main/resources/mapper/ComProjectDAO.xml

@@ -40,7 +40,7 @@
 
     <select id="getById" parameterType="java.lang.String" resultType="com.yiboshi.science.param.dto.ComProjectDTO">
         SELECT a.*,b.name knowledge_name,
-               ic.proj_id,ic.job_time,ic.main_research_areas,
+               ic.proj_id,ic.job_time,ic.main_research_areas,ic.address
                ic.unit_link_name,ic.unit_link_mobile,ic.unit_link_email,ic.unit_link_fax,ic.subject_scope,ic.proj_abstract,ic.proj_keywords,
                ic.total_funding,ic.gov_funding,ic.unit_funding,ic.self_funding,ic.other_funding,
                ic.proj_content,