xujun

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

@@ -66,7 +66,7 @@ public class ComPerson extends BaseEntity {
     private Date degreeUnit;
     /** 是否为研究生导师 */
     @ApiModelProperty(value = "是否为研究生导师", position = 8)
-    @Length(max=36, message = "是否为研究生导师不能大于36")
+    @Length(max=120, message = "是否为研究生导师不能大于120")
     private String graduateTeacher;
     /** 党派 */
     @ApiModelProperty(value = "党派", position = 9)

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

@@ -47,7 +47,7 @@ public class ComTalentApply extends BaseEntity {
 
     /** 人才类型 */
     @ApiModelProperty(value = "人才类型", position = 2)
-    @Length(max=36, message = "人才类型不能大于36")
+    @Length(max=350, message = "人才类型不能大于350")
     private String talentType;
     
     /** 荣誉称号 */
@@ -144,4 +144,8 @@ public class ComTalentApply extends BaseEntity {
     /** 人才申报状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准,50 批准 */
     @ApiModelProperty(value = "人才申报状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准,50 批准", position = 7 )
     private Integer talentState;
+
+    /** 项目完成状态 */
+    @ApiModelProperty(value = "项目完成状态", position = 22)
+    private String completeStatus;
 } 
\ No newline at end of file

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

@@ -108,6 +108,55 @@ public class ComTalentApplyDTO extends BaseDTO {
     /** 人才申报状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准,50 批准 */
     @ApiModelProperty(value = "人才申报状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准,50 批准", position = 7 )
     private Integer talentState;
+
+    /** 项目完成状态 */
+    @ApiModelProperty(value = "项目完成状态")
+    private String completeStatus;
+
+    /** 保存步骤 */
+    @ApiModelProperty(value = "保存步骤")
+    private Integer step;
+
+    /** 证件号 */
+    @ApiModelProperty(value = "证件号")
+    private String certId;
+
+    /** 姓名 */
+    @ApiModelProperty(value = "姓名", position = 4)
+    private String personName;
+    /** 性别 */
+    @ApiModelProperty(value = "性别", position = 5)
+    private String sex;
+    /** 出生日期 */
+    @ApiModelProperty(value = "出生日期", position = 6)
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date birthday;
+
+    /** 学位 */
+    @ApiModelProperty(value = "学位", position = 9)
+    private String degree;
+
+    /** 民族 */
+    @ApiModelProperty(value = "民族", position = 11)
+    private String nation;
+    /** 职务 */
+    @ApiModelProperty(value = "职务", position = 12)
+    private String duty;
+    /** 职称 */
+    @ApiModelProperty(value = "职称", position = 13)
+    private String title;
+    /** 专业 */
+    @ApiModelProperty(value = "专业", position = 14)
+    private String spec;
+    /** 邮箱 */
+    @ApiModelProperty(value = "邮箱", position = 15)
+    private String email;
+    /** 电话 */
+    @ApiModelProperty(value = "电话", position = 9)
+    private String telephone;
+    /** 传真 */
+    @ApiModelProperty(value = "传真", position = 9)
+    private String fax;
     
     @ApiModelProperty(value = "团队成员列表")
     private List<ComTalentMembersDTO> membersList;

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

@@ -128,6 +128,10 @@ public class ComTalentApplyQueryVO extends PaginationVO {
     @ApiModelProperty(value = "人才申报状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准,50 批准", position = 7 )
     private Integer talentState;
 
+    /** 项目完成状态 */
+    @ApiModelProperty(value = "项目完成状态")
+    private String completeStatus;
+
     @ApiModelProperty(value = "团队成员列表")
     private List<ComTalentMembersDTO> membersList;
 

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

@@ -193,4 +193,12 @@ public class ComPersonController extends BaseController<ComPersonService, ComPer
         ComPersonDTO comPersonDTO = comPersonService.getPersonById(id);
         return ResponseDataModel.ok(comPersonDTO);
     }
+
+    @ApiOperation(value = "通过certId获取人员信息", httpMethod = "GET", notes = "通过certId获取人员信息")
+    @GetMapping
+    @RequestMapping("/getPersonByCertId")
+    public ResponseDataModel<ComPerson> getPersonByCertId(String certId) {
+        ComPerson entity = comPersonService.getPersonByCertId(certId);
+        return ResponseDataModel.ok(entity);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.yiboshi.science.base.BaseService;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.entity.ComPerson;
 import com.yiboshi.science.param.dto.ComPersonDTO;
+import com.yiboshi.science.param.dto.ComTalentApplyDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
 import com.yiboshi.science.param.dto.UserImportDTO;
 import com.yiboshi.science.param.query.ComPersonQueryVO;
@@ -108,4 +109,6 @@ public interface ComPersonService extends BaseService<ComPersonQueryVO, ComPerso
     DataStatisticsDTO getRegisterPersonCountByDay(ComPersonQueryVO v);
 
     boolean isComplete(ComPerson person);
+
+    String insertOrUpdate(ComTalentApplyDTO dto);
 }

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

@@ -19,6 +19,7 @@ import com.yiboshi.science.service.ComSendingRecordService;
 import com.yiboshi.science.service.SystemUserRoleService;
 import com.yiboshi.science.service.SystemUserService;
 import com.yiboshi.science.utils.RedisUtils;
+import com.yiboshi.science.utils.StringUtil;
 import com.yiboshi.yac.model.dto.UserDTO;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -508,4 +509,23 @@ public class ComPersonServiceImpl extends BaseServiceImpl<ComPersonDAO, ComPerso
 //        excelUtils.writeExcel(list);
         return list;
     }
+    @Transactional
+    public String insertOrUpdate(ComTalentApplyDTO dto) {
+        ComPerson model = new ComPerson();
+        if (Objects.nonNull(dto.getPersonId())) {
+            model.setId(dto.getPersonId());
+            model = this.getEntity(model);
+        }
+        String id = "";
+        if (null == model) {
+            model = new ComPerson();
+            StringUtil.copyObj2Obj(dto, model);
+            id = this.insert(model);
+        } else {
+            id = model.getId();
+            StringUtil.copyObj2Obj(dto, model);
+            this.update(model);
+        }
+        return id;
+    }
 }

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

@@ -5,18 +5,21 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
 import com.yiboshi.science.dao.ComTalentApplyDAO;
+import com.yiboshi.science.entity.ComPerson;
 import com.yiboshi.science.entity.ComProject;
 import com.yiboshi.science.entity.ComTalentApply;
 import com.yiboshi.science.enumeration.CommonEnum;
-import com.yiboshi.science.param.dto.ComProjectDTO;
+import com.yiboshi.science.param.dto.ComPersonDTO;
 import com.yiboshi.science.param.dto.ComTalentApplyDTO;
 import com.yiboshi.science.param.dto.DataStatisticsDTO;
-import com.yiboshi.science.param.query.ComProjectQueryVO;
 import com.yiboshi.science.param.query.ComTalentApplyQueryVO;
+import com.yiboshi.science.service.ComPersonService;
 import com.yiboshi.science.service.ComTalentApplyService;
+import com.yiboshi.science.utils.StringUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Objects;
@@ -34,6 +37,9 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
     @Autowired
     private ComTalentApplyDAO comTalentApplyDAO;
 
+    @Autowired
+    private ComPersonService comPersonService;
+
     @Override
     protected void setCriteriaForQuery(ComTalentApplyQueryVO vo, QueryWrapper<ComTalentApplyQueryVO> criteria) {
         if (Objects.nonNull(vo.getCertId())) {
@@ -101,4 +107,53 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
         this.notNullField(e, criteria);
         return comTalentApplyDAO.getCount(criteria);
     }
+
+    public String save(ComTalentApplyDTO dto) {
+        String id = "";
+        switch (dto.getStep()) {
+            case 0://申报人基本情况
+                id = talentSaveStep0(dto);
+                break;
+            case 1://申报人简历
+                break;
+            case 2://申报人科研成绩
+                break;
+            case 3://科学研究规划及团队人员名单
+                break;
+            case 4://经费预算及培养计划和目标
+                break;
+            case 5://附件
+                break;
+        }
+        return id;
+    }
+
+    private String talentSaveStep0(ComTalentApplyDTO dto) {
+        String id = "";
+        if (Objects.isNull(dto.getId()))
+            id = InsertTalentBaseInfo(dto);
+        else {
+            ComTalentApply apply = this.entityById(dto.getId());
+            if (null == apply) {
+                id = InsertTalentBaseInfo(dto);
+            } else
+                id = UpdateProjectBaseInfo(dto);
+        }
+        return id;
+    }
+
+    private String InsertTalentBaseInfo(ComTalentApplyDTO dto) {
+
+        String PersonID = comPersonService.insertOrUpdate(dto);
+        ComTalentApply apply = convert2Entity(dto);
+        apply.setPersonId(PersonID);
+        String id = this.insert(apply);
+        return id;
+    }
+
+    private String UpdateProjectBaseInfo(ComTalentApplyDTO dto) {
+        comPersonService.insertOrUpdate(dto);
+        ComTalentApply apply = convert2Entity(dto);
+        return this.update(apply);
+    }
 }