修改bug

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/EXPersonUser.java

@@ -56,153 +56,153 @@ public class EXPersonUser {
     @ApiModelProperty(value = "年龄")
     private Integer age;
 
-    @ExcelProperty(value = "籍贯", index = 9)
+    @ExcelIgnore
     @ApiModelProperty(value = "籍贯")
     private String nativePlace;
 
-    @ExcelProperty(value = "民族", index = 10)
-    @ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class,type="MZ") //固定下拉内容
+    @ExcelProperty(value = "民族", index = 9)
+    @ExplicitConstraint(indexNum = 9, sourceClass = CommonExplicitConstraint.class,type="MZ") //固定下拉内容
     @ApiModelProperty(value = "民族")
     private String folkKey;
 
-    @ExcelProperty(value = "政治面貌", index =11)
-    @ExplicitConstraint(indexNum = 11,  source = {"群众","共青团员","预备党员","中共党员"}) //固定下拉内容
+    @ExcelProperty(value = "政治面貌", index =10)
+    @ExplicitConstraint(indexNum = 10,  source = {"群众","共青团员","预备党员","中共党员"}) //固定下拉内容
     @ApiModelProperty(value = "政治面貌")
     private String politicCountenance;
 
-    @ExcelProperty(value = "户籍地址", index = 12)
+    @ExcelProperty(value = "户籍地址", index = 11)
     @ApiModelProperty(value = "户籍地址")
     private String registeredResidenceAddress;
 
-    @ExcelProperty(value = "现住址", index = 13)
+    @ExcelProperty(value = "现住址", index = 12)
     @ApiModelProperty(value = "现住址")
     private String presentAddress;
 
-    @ExcelProperty(value = "应急电话", index = 14)
+    @ExcelProperty(value = "应急电话", index = 13)
     @ApiModelProperty(value = "应急电话")
     private String emergencyPhone;
 
-    @ExcelProperty(value = "电话", index = 15)
+    @ExcelProperty(value = "电话", index = 14)
     @ApiModelProperty(value = "电话")
     private String phone;
 
-    @ExcelProperty(value = "身高（厘米）", index = 16)
+    @ExcelProperty(value = "身高（厘米）", index = 15)
     @ApiModelProperty(value = "身高（厘米）")
     private Integer height;
 
-    @ExcelProperty(value = "体重（千克）", index = 17)
+    @ExcelProperty(value = "体重（千克）", index = 16)
     @ApiModelProperty(value = "体重（千克）")
     private Integer weight;
 
-    @ExcelProperty(value = "参加工作时间", index = 18)
+    @ExcelProperty(value = "参加工作时间", index = 17)
     @ApiModelProperty(value = "参加工作时间")
     private Date workTime;
 
-    @ExcelProperty(value = "进入本单位工作时间", index = 19)
+    @ExcelProperty(value = "进入本单位工作时间", index = 18)
     @ApiModelProperty(value = "进入本单位工作时间")
     private Date stationWorkTime;
 
-    @ExcelProperty(value = "工作所在地", index = 20)
-    @ExplicitConstraint(indexNum = 20,  source = {"国内","国外"}) //固定下拉内容
+    @ExcelProperty(value = "工作所在地", index = 19)
+    @ExplicitConstraint(indexNum = 19,  source = {"国内","国外"}) //固定下拉内容
     @ApiModelProperty(value = "工作所在地key")
     private String workPlaceKey;
 
-    @ExcelProperty(value = "岗位", index = 21)
-    @ExplicitConstraint(indexNum = 21,sourceClass = CommonExplicitConstraint.class,type="YGZYJNJDZS") //固定下拉内容
+    @ExcelProperty(value = "岗位", index = 20)
+    @ExplicitConstraint(indexNum = 20,sourceClass = CommonExplicitConstraint.class,type="YGZYJNJDZS") //固定下拉内容
     @ApiModelProperty(value = "岗位")
     private String postName;
 
-    @ExcelProperty(value = "是否特殊工种", index = 22)
-    @ExplicitConstraint(indexNum = 22,  source = {"是","否"}) //固定下拉内容
+    @ExcelProperty(value = "是否特殊工种", index = 21)
+    @ExplicitConstraint(indexNum = 21,  source = {"是","否"}) //固定下拉内容
     @ApiModelProperty(value = "是否特殊工种")
     private Integer isSpecialWork;
 
-    @ExcelProperty(value = "技能鉴定工种", index = 23)
-    @ExplicitConstraint(indexNum = 23, sourceClass = CommonExplicitConstraint.class,type="JNDDGZ") //固定下拉内容
+    @ExcelProperty(value = "技能鉴定工种", index = 22)
+    @ExplicitConstraint(indexNum = 22, sourceClass = CommonExplicitConstraint.class,type="JNDDGZ") //固定下拉内容
     @ApiModelProperty(value = "技能鉴定工种key")
     private String workTypeKey;
 
-    @ExcelProperty(value = "工种名称", index = 24)
-    @ExplicitConstraint(indexNum = 24, sourceClass = CommonExplicitConstraint.class,type="JNJDGZ") //固定下拉内容
+    @ExcelProperty(value = "工种名称", index = 23)
+    @ExplicitConstraint(indexNum = 23, sourceClass = CommonExplicitConstraint.class,type="JNJDGZ") //固定下拉内容
     @ApiModelProperty(value = "工种名称")
     private String workName;
 
-    @ExcelProperty(value = "专业技术资格名称", index = 25)
-    @ExplicitConstraint(indexNum = 25, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
+    @ExcelProperty(value = "专业技术资格名称", index = 24)
+    @ExplicitConstraint(indexNum = 24, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
     @ApiModelProperty(value = "专业技术资格名称")
     private String professionalTechnologyName;
 
-    @ExcelProperty(value = "技能等级", index = 26)
-    @ExplicitConstraint(indexNum = 26, source = {"无","初级工","中级工","高级工","技师","高级技师","其他"}) //固定下拉内容
+    @ExcelProperty(value = "技能等级", index = 25)
+    @ExplicitConstraint(indexNum = 25, source = {"无","初级工","中级工","高级工","技师","高级技师","其他"}) //固定下拉内容
     @ApiModelProperty(value = "技能等级key")
     private String skillLevelKey;
 
-    @ExcelProperty(value = "专业技术资格等级", index = 27)
-    @ExplicitConstraint(indexNum = 27, source = {"初级","中级","副高级","正高级","教授级"}) //固定下拉内容
+    @ExcelProperty(value = "专业技术资格等级", index = 26)
+    @ExplicitConstraint(indexNum = 26, source = {"初级","中级","副高级","正高级","教授级"}) //固定下拉内容
     @ApiModelProperty(value = "专业技术资格等级")
     private String professionalTechnologyLevelKey;
 
-    @ExcelProperty(value = "岗位执业鉴定证书", index = 28)
+    @ExcelProperty(value = "岗位执业鉴定证书", index = 27)
     @ApiModelProperty(value = "岗位执业鉴定证书")
-    @ExplicitConstraint(indexNum = 28, sourceClass = CommonExplicitConstraint.class,type="POST_PRACTICE_CERTIFICATE") //固定下拉内容
+    @ExplicitConstraint(indexNum = 27, sourceClass = CommonExplicitConstraint.class,type="POST_PRACTICE_CERTIFICATE") //固定下拉内容
     private String professionalQualificationCertificate;
 
-    @ExcelProperty(value = "岗位职业鉴定证书", index = 29)
+    @ExcelProperty(value = "岗位职业鉴定证书", index = 28)
     @ApiModelProperty(value = " 岗位职业鉴定证书")
-    @ExplicitConstraint(indexNum = 29, sourceClass = CommonExplicitConstraint.class,type="POST_OCCUPATION_CERTIFICATE") //固定下拉内容
+    @ExplicitConstraint(indexNum = 28, sourceClass = CommonExplicitConstraint.class,type="POST_OCCUPATION_CERTIFICATE") //固定下拉内容
     private String professionalCareerCertificate;
 
-    @ExcelProperty(value = "初始学历", index = 30)
+    @ExcelProperty(value = "初始学历", index = 29)
     @ApiModelProperty(value = "初始学历key")
-    @ExplicitConstraint(indexNum = 30, sourceClass = CommonExplicitConstraint.class,type="CSXL") //固定下拉内容
+    @ExplicitConstraint(indexNum = 29, sourceClass = CommonExplicitConstraint.class,type="CSXL") //固定下拉内容
     private String initialEducationKey;
 
-    @ExcelProperty(value = "现学历", index = 31)
-    @ExplicitConstraint(indexNum = 31, sourceClass = CommonExplicitConstraint.class,type="XXL") //固定下拉内容
+    @ExcelProperty(value = "现学历", index = 30)
+    @ExplicitConstraint(indexNum = 30, sourceClass = CommonExplicitConstraint.class,type="XXL") //固定下拉内容
     @ApiModelProperty(value = "现学历key")
     private String currentEducationKey;
 
-    @ExcelProperty(value = "现学历学校名称", index = 32)
+    @ExcelProperty(value = "现学历学校名称", index = 31)
     @ApiModelProperty(value = "现学历学校名称")
     private String currentSchool;
 
-    @ExcelProperty(value = "现学历所学专业", index = 33)
+    @ExcelProperty(value = "现学历所学专业", index = 32)
     @ApiModelProperty(value = "现学历所学专业")
     private String currentMajor;
 
-    @ExcelProperty(value = "证件类型", index = 34)
+    @ExcelProperty(value = "证件类型", index = 33)
     @ApiModelProperty(value = "证件类型")
-    @ExplicitConstraint(indexNum = 34, sourceClass = CommonExplicitConstraint.class,type="ZDLX") //固定下拉内容
+    @ExplicitConstraint(indexNum = 33, sourceClass = CommonExplicitConstraint.class,type="ZDLX") //固定下拉内容
     private String documentType;
 
-    @ExcelProperty(value = "证书名称", index = 35)
+    @ExcelProperty(value = "证书名称", index = 34)
     @ApiModelProperty(value = "证书名称")
-    @ExplicitConstraint(indexNum = 35, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
+    @ExplicitConstraint(indexNum = 34, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
     private String certificateName;
 
-    @ExcelProperty(value = "取证时间", index = 36)
+    @ExcelProperty(value = "取证时间", index = 35)
     @ApiModelProperty(value = "取证时间")
     private Date certificateTime;
 
-    @ExcelProperty(value = "发证机关", index = 37)
+    @ExcelProperty(value = "发证机关", index = 36)
     @ApiModelProperty(value = "发证机关")
     private String issuingAuthority;
 
-    @ExcelProperty(value = "证书编号", index = 38)
+    @ExcelProperty(value = "证书编号", index = 37)
     @ApiModelProperty(value = "证书编号")
     private String certificateNum;
 
-    @ExcelProperty(value = "取证项目", index = 39)
+    @ExcelProperty(value = "取证项目", index = 38)
     @ApiModelProperty(value = "取证项目")
     private String certificateProject;
 
-    @ExcelProperty(value = "有效期限", index = 40)
+    @ExcelProperty(value = "有效期限", index = 39)
     @ApiModelProperty(value = "有效期限")
     private String validPeriod;
 
-    @ExcelProperty(value = "证书等级", index = 41)
+    @ExcelProperty(value = "证书等级", index = 40)
     @ApiModelProperty(value = "证书等级")
-    @ExplicitConstraint(indexNum = 41, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
+    @ExplicitConstraint(indexNum = 40, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
     private String certificateGrade;
 
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonUser.java

@@ -32,7 +32,7 @@ public class PersonUser {
     private Integer age;
 
     @ApiModelProperty(value = "籍贯")
-    private String nativePlace;
+    private List<Integer>  nativePlace;
 
     @ApiModelProperty(value = "民族")
     private String folkKey;

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

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
@@ -124,6 +125,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         }else{
             personBasic.setProjectOrgCode(companyModel.getOrgCode());
         }
+
+        if(!personUser.getNativePlace().isEmpty()){
+            personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
+        }
+
+
         this.baseMapper.insert(personBasic);
         //人员技能学历信息
         PersonSkillEducation personSkillEducation = new PersonSkillEducation();
@@ -132,6 +139,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         personSkillEducationService.save(personSkillEducation);
         //人员资质信息
         personCertificate.setPersonId(personBasic.getSequenceNbr());
+
         personCertificateService.save(personCertificate);
         //人员账号信息
         personAccount.setPersonId(personBasic.getSequenceNbr());
@@ -200,6 +208,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         }else{
             personBasic.setProjectOrgCode(companyModel.getOrgCode());
         }
+        if(!personUser.getNativePlace().isEmpty()){
+            personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
+        }
         this.personBasicMapper.updateById(personBasic);