解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonCertificate.java

@@ -76,4 +76,10 @@ public class PersonCertificate extends BaseEntity {
 	@TableField("certificate_attachment")
     private String certificateAttachment;
 
+    /**
+     * 人员信息id
+     */
+    @TableField("person_id")
+    private Long personId;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -8,15 +8,25 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgUserVO;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTPDlExcelDto;
 import com.yeejoin.amos.boot.module.common.api.dto.UserVO;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonDto;
+<<<<<<< HEAD
 import com.yeejoin.amos.boot.module.jxiop.api.dto.UserDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
+=======
+import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonUser;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
+>>>>>>> a5d8520121e78a54ff1c3179fe3673aaa18c6ab9
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonAccountService;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonBasicDto;
+<<<<<<< HEAD
 import com.yeejoin.amos.boot.module.jxiop.biz.fegin.PrivilegeFeignClient;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.openfeign.FeignClient;
+=======
+import org.springframework.beans.BeanUtils;
+>>>>>>> a5d8520121e78a54ff1c3179fe3673aaa18c6ab9
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -41,8 +51,21 @@ import java.util.*;
 public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBasic,PersonBasicMapper> implements IPersonBasicService {
 
 
+
     @Autowired
     PrivilegeFeignClient privilegeFeignClient;
+
+    //人员基本信息service
+    PersonBasicServiceImpl personBasicService;
+    //人员账号信息service
+    PersonAccountServiceImpl personAccountService;
+    //人员归属信息service
+    PersonAscriptionServiceImpl personAscriptionService;
+    //人员资质信息service
+    PersonCertificateServiceImpl personCertificateService;
+    //人员教育信息
+    PersonSkillEducationServiceImpl personSkillEducationService;
+
     /**
      * 分页查询
      */
@@ -62,8 +85,33 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
      * */
     @Transactional
     public void addPerson(PersonDto model){
-
-
+        //获取人员基本信息数据
+        PersonUser personUser =model.getPersonUser();
+        //获取人员资质信息
+        PersonCertificate personCertificate =model.getPersonCertificate();
+        //获取人员账号信息
+        PersonAccount personAccount =model.getPersonAccount();
+
+        //人员基础信息
+        PersonBasic personBasic = new PersonBasic();
+        BeanUtils.copyProperties(personUser,personBasic);
+        personBasicService.save(personBasic);
+        //人员归属信息
+        PersonAscription personAscription = new PersonAscription();
+        BeanUtils.copyProperties(personUser,personAscription);
+        personAscription.setPersonId(personBasic.getSequenceNbr());
+        personAscriptionService.save(personAscription);
+        //人员归属信息
+        PersonSkillEducation personSkillEducation = new PersonSkillEducation();
+        BeanUtils.copyProperties(personUser,personSkillEducation);
+        personSkillEducation.setPersonId(personBasic.getSequenceNbr());
+        personSkillEducationService.save(personSkillEducation);
+        //人员资质信息
+        personCertificate.setPersonId(personBasic.getSequenceNbr());
+        personCertificateService.save(personCertificate);
+        //人员账号信息
+        personAccount.setPersonId(personBasic.getSequenceNbr());
+        personAccountService.save(personAccount);
     }
 
 
@@ -84,5 +132,4 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
 
 
 
-
 }
\ No newline at end of file