修改bug

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.yeejoin.amos.boot.biz.common.excel.CommonExplicitConstraint;
 import com.yeejoin.amos.boot.biz.common.excel.ExplicitConstraint;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -26,182 +27,182 @@ public class EXPersonUser {
     @ExcelProperty(value = "所属场站", index = 2)
     @ApiModelProperty(value = "所属场站")
     private String projectName;
-    @ExcelProperty(value = "部门", index = 3)
+    @ExcelIgnore
     @ApiModelProperty(value = "部门")
     private String departmentName;
-    @ExcelProperty(value = "证件类型", index = 4)
+    @ExcelProperty(value = "证件类型", index = 3)
     @ApiModelProperty(value = "证件类型(0-身份证)")
     private String idType;
-    @ExcelProperty(value = "证件编号", index = 5)
+    @ExcelProperty(value = "证件编号", index = 4)
     @ApiModelProperty(value = "证件编号")
     private String idNumber;
-    @ExcelProperty(value = "平台账号名称", index = 6)
+    @ExcelProperty(value = "平台账号名称", index = 5)
     @ApiModelProperty(value = "平台账号名称")
     private String accountName;
 
 
 
 
-    @ExplicitConstraint(indexNum = 7, source = {"男","女"}) //固定下拉内容
-    @ExcelProperty(value = "性别", index = 7)
+    @ExplicitConstraint(indexNum = 6, source = {"男","女"}) //固定下拉内容
+    @ExcelProperty(value = "性别", index = 6)
     @ApiModelProperty(value = "性别( 0-男 1-女 )")
     private String sex;
 
-    @ExcelProperty(value = "生日", index = 8)
+    @ExcelProperty(value = "生日", index = 7)
     @ApiModelProperty(value = "生日")
     private Date birthday;
 
-    @ExcelProperty(value = "年龄", index = 9)
+    @ExcelProperty(value = "年龄", index = 8)
     @ApiModelProperty(value = "年龄")
     private Integer age;
 
-    @ExcelProperty(value = "籍贯", index = 10)
+    @ExcelProperty(value = "籍贯", index = 9)
     @ApiModelProperty(value = "籍贯")
     private String nativePlace;
 
-    @ExcelProperty(value = "民族", index = 11)
-    @ExplicitConstraint(indexNum = 11, sourceClass = CommonExplicitConstraint.class,type="MZ") //固定下拉内容
+    @ExcelProperty(value = "民族", index = 10)
+    @ExplicitConstraint(indexNum = 10, sourceClass = CommonExplicitConstraint.class,type="MZ") //固定下拉内容
     @ApiModelProperty(value = "民族")
     private String folkKey;
 
-    @ExcelProperty(value = "政治面貌", index =12)
-    @ExplicitConstraint(indexNum = 12,  source = {"群众","共青团员","预备党员","中共党员"}) //固定下拉内容
+    @ExcelProperty(value = "政治面貌", index =11)
+    @ExplicitConstraint(indexNum = 11,  source = {"群众","共青团员","预备党员","中共党员"}) //固定下拉内容
     @ApiModelProperty(value = "政治面貌")
     private String politicCountenance;
 
-    @ExcelProperty(value = "户籍地址", index = 13)
+    @ExcelProperty(value = "户籍地址", index = 12)
     @ApiModelProperty(value = "户籍地址")
     private String registeredResidenceAddress;
 
-    @ExcelProperty(value = "现住址", index = 14)
+    @ExcelProperty(value = "现住址", index = 13)
     @ApiModelProperty(value = "现住址")
     private String presentAddress;
 
-    @ExcelProperty(value = "应急电话", index = 15)
+    @ExcelProperty(value = "应急电话", index = 14)
     @ApiModelProperty(value = "应急电话")
     private String emergencyPhone;
 
-    @ExcelProperty(value = "电话", index = 16)
+    @ExcelProperty(value = "电话", index = 15)
     @ApiModelProperty(value = "电话")
     private String phone;
 
-    @ExcelProperty(value = "身高（厘米）", index = 17)
+    @ExcelProperty(value = "身高（厘米）", index = 16)
     @ApiModelProperty(value = "身高（厘米）")
     private Integer height;
 
-    @ExcelProperty(value = "体重（千克）", index = 18)
+    @ExcelProperty(value = "体重（千克）", index = 17)
     @ApiModelProperty(value = "体重（千克）")
     private Integer weight;
 
-    @ExcelProperty(value = "参加工作时间", index = 19)
+    @ExcelProperty(value = "参加工作时间", index = 18)
     @ApiModelProperty(value = "参加工作时间")
     private Date workTime;
 
-    @ExcelProperty(value = "进入本单位工作时间", index = 20)
+    @ExcelProperty(value = "进入本单位工作时间", index = 19)
     @ApiModelProperty(value = "进入本单位工作时间")
     private Date stationWorkTime;
 
-    @ExcelProperty(value = "工作所在地", index = 21)
-    @ExplicitConstraint(indexNum = 21,  source = {"国内","国外"}) //固定下拉内容
+    @ExcelProperty(value = "工作所在地", index = 20)
+    @ExplicitConstraint(indexNum = 20,  source = {"国内","国外"}) //固定下拉内容
     @ApiModelProperty(value = "工作所在地key")
     private String workPlaceKey;
 
-    @ExcelProperty(value = "岗位", index = 22)
-    @ExplicitConstraint(indexNum = 22,sourceClass = CommonExplicitConstraint.class,type="YGZYJNJDZS") //固定下拉内容
+    @ExcelProperty(value = "岗位", index = 21)
+    @ExplicitConstraint(indexNum = 21,sourceClass = CommonExplicitConstraint.class,type="YGZYJNJDZS") //固定下拉内容
     @ApiModelProperty(value = "岗位")
     private String postName;
 
-    @ExcelProperty(value = "是否特殊工种", index = 23)
-    @ExplicitConstraint(indexNum = 23,  source = {"是","否"}) //固定下拉内容
+    @ExcelProperty(value = "是否特殊工种", index = 22)
+    @ExplicitConstraint(indexNum = 22,  source = {"是","否"}) //固定下拉内容
     @ApiModelProperty(value = "是否特殊工种")
     private Integer isSpecialWork;
 
-    @ExcelProperty(value = "技能鉴定工种", index = 24)
-    @ExplicitConstraint(indexNum = 24, sourceClass = CommonExplicitConstraint.class,type="JNDDGZ") //固定下拉内容
+    @ExcelProperty(value = "技能鉴定工种", index = 23)
+    @ExplicitConstraint(indexNum = 23, sourceClass = CommonExplicitConstraint.class,type="JNDDGZ") //固定下拉内容
     @ApiModelProperty(value = "技能鉴定工种key")
     private String workTypeKey;
 
-    @ExcelProperty(value = "工种名称", index = 25)
-    @ExplicitConstraint(indexNum = 25, sourceClass = CommonExplicitConstraint.class,type="JNJDGZ") //固定下拉内容
+    @ExcelProperty(value = "工种名称", index = 24)
+    @ExplicitConstraint(indexNum = 24, sourceClass = CommonExplicitConstraint.class,type="JNJDGZ") //固定下拉内容
     @ApiModelProperty(value = "工种名称")
     private String workName;
 
-    @ExcelProperty(value = "专业技术资格名称", index = 26)
-    @ExplicitConstraint(indexNum = 26, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
+    @ExcelProperty(value = "专业技术资格名称", index = 25)
+    @ExplicitConstraint(indexNum = 25, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
     @ApiModelProperty(value = "专业技术资格名称")
     private String professionalTechnologyName;
 
-    @ExcelProperty(value = "技能等级", index = 27)
-    @ExplicitConstraint(indexNum = 27, source = {"无","初级工","中级工","高级工","技师","高级技师","其他"}) //固定下拉内容
+    @ExcelProperty(value = "技能等级", index = 26)
+    @ExplicitConstraint(indexNum = 26, source = {"无","初级工","中级工","高级工","技师","高级技师","其他"}) //固定下拉内容
     @ApiModelProperty(value = "技能等级key")
     private String skillLevelKey;
 
-    @ExcelProperty(value = "专业技术资格等级", index = 28)
-    @ExplicitConstraint(indexNum = 28, source = {"初级","中级","副高级","正高级","教授级"}) //固定下拉内容
+    @ExcelProperty(value = "专业技术资格等级", index = 27)
+    @ExplicitConstraint(indexNum = 27, source = {"初级","中级","副高级","正高级","教授级"}) //固定下拉内容
     @ApiModelProperty(value = "专业技术资格等级")
     private String professionalTechnologyLevelKey;
 
-    @ExcelProperty(value = "岗位执业鉴定证书", index = 29)
+    @ExcelProperty(value = "岗位执业鉴定证书", index = 28)
     @ApiModelProperty(value = "岗位执业鉴定证书")
-    @ExplicitConstraint(indexNum = 29, sourceClass = CommonExplicitConstraint.class,type="POST_PRACTICE_CERTIFICATE") //固定下拉内容
+    @ExplicitConstraint(indexNum = 28, sourceClass = CommonExplicitConstraint.class,type="POST_PRACTICE_CERTIFICATE") //固定下拉内容
     private String professionalQualificationCertificate;
 
-    @ExcelProperty(value = "岗位职业鉴定证书", index = 30)
+    @ExcelProperty(value = "岗位职业鉴定证书", index = 29)
     @ApiModelProperty(value = " 岗位职业鉴定证书")
-    @ExplicitConstraint(indexNum = 30, sourceClass = CommonExplicitConstraint.class,type="POST_OCCUPATION_CERTIFICATE") //固定下拉内容
+    @ExplicitConstraint(indexNum = 29, sourceClass = CommonExplicitConstraint.class,type="POST_OCCUPATION_CERTIFICATE") //固定下拉内容
     private String professionalCareerCertificate;
 
-    @ExcelProperty(value = "初始学历", index = 31)
+    @ExcelProperty(value = "初始学历", index = 30)
     @ApiModelProperty(value = "初始学历key")
-    @ExplicitConstraint(indexNum = 31, sourceClass = CommonExplicitConstraint.class,type="CSXL") //固定下拉内容
+    @ExplicitConstraint(indexNum = 30, sourceClass = CommonExplicitConstraint.class,type="CSXL") //固定下拉内容
     private String initialEducationKey;
 
-    @ExcelProperty(value = "现学历", index = 32)
-    @ExplicitConstraint(indexNum = 32, sourceClass = CommonExplicitConstraint.class,type="XXL") //固定下拉内容
+    @ExcelProperty(value = "现学历", index = 31)
+    @ExplicitConstraint(indexNum = 31, sourceClass = CommonExplicitConstraint.class,type="XXL") //固定下拉内容
     @ApiModelProperty(value = "现学历key")
     private String currentEducationKey;
 
-    @ExcelProperty(value = "现学历学校名称", index = 33)
+    @ExcelProperty(value = "现学历学校名称", index = 32)
     @ApiModelProperty(value = "现学历学校名称")
     private String currentSchool;
 
-    @ExcelProperty(value = "现学历所学专业", index = 34)
+    @ExcelProperty(value = "现学历所学专业", index = 33)
     @ApiModelProperty(value = "现学历所学专业")
     private String currentMajor;
 
-    @ExcelProperty(value = "证件类型", index = 35)
+    @ExcelProperty(value = "证件类型", index = 34)
     @ApiModelProperty(value = "证件类型")
-    @ExplicitConstraint(indexNum = 35, sourceClass = CommonExplicitConstraint.class,type="ZDLX") //固定下拉内容
+    @ExplicitConstraint(indexNum = 34, sourceClass = CommonExplicitConstraint.class,type="ZDLX") //固定下拉内容
     private String documentType;
 
-    @ExcelProperty(value = "证书名称", index = 36)
+    @ExcelProperty(value = "证书名称", index = 35)
     @ApiModelProperty(value = "证书名称")
-    @ExplicitConstraint(indexNum = 36, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
+    @ExplicitConstraint(indexNum = 35, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
     private String certificateName;
 
-    @ExcelProperty(value = "取证时间", index = 37)
+    @ExcelProperty(value = "取证时间", index = 36)
     @ApiModelProperty(value = "取证时间")
     private Date certificateTime;
 
-    @ExcelProperty(value = "发证机关", index = 38)
+    @ExcelProperty(value = "发证机关", index = 37)
     @ApiModelProperty(value = "发证机关")
     private String issuingAuthority;
 
-    @ExcelProperty(value = "证书编号", index = 39)
+    @ExcelProperty(value = "证书编号", index = 38)
     @ApiModelProperty(value = "证书编号")
     private String certificateNum;
 
-    @ExcelProperty(value = "取证项目", index = 40)
+    @ExcelProperty(value = "取证项目", index = 39)
     @ApiModelProperty(value = "取证项目")
     private String certificateProject;
 
-    @ExcelProperty(value = "有效期限", index = 41)
+    @ExcelProperty(value = "有效期限", index = 40)
     @ApiModelProperty(value = "有效期限")
     private String validPeriod;
 
-    @ExcelProperty(value = "证书等级", index = 42)
+    @ExcelProperty(value = "证书等级", index = 41)
     @ApiModelProperty(value = "证书等级")
-    @ExplicitConstraint(indexNum = 42, sourceClass = CommonExplicitConstraint.class,type="ZYJSZGMC") //固定下拉内容
+    @ExplicitConstraint(indexNum = 41, 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/ExStationBasicDto.java

@@ -21,7 +21,7 @@ public class ExStationBasicDto {
     @ExcelProperty(value = "场站编号", index = 1)
     @ApiModelProperty(value = "场站编号")
     private String stationCode;
-    @ExplicitConstraint(indexNum = 2, source = {"建设方","总承包方","分包方"}) //固定下拉内容
+    @ExplicitConstraint(indexNum = 2, sourceClass = CommonExplicitConstraint.class, method = "getstationType") //固定下拉内容
     @ExcelProperty(value = "场站类型", index = 2)
     @ApiModelProperty(value = "场站类型")
     private String stationType;

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.CommonFile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -80,6 +81,7 @@ public class PersonBasicDto  extends BaseDto {
     private List<CommonFile> backCertificatePhoto;
 
     @ApiModelProperty(value = "进入本单位工作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date stationWorkTime;
 
     @ApiModelProperty(value = "工作所在地key")

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

@@ -77,6 +77,18 @@ public class PersonUser {
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<CommonFile> backCertificatePhoto;
 
+    @ApiModelProperty(value = "进入本单位工作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date stationWorkTime;
+
+    @ApiModelProperty(value = "工作所在地key")
+    private String workPlaceKey;
+
+    @ApiModelProperty(value = "岗位")
+    private String postName;
+
+
+
     /**
      * 技能学历
      * */

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

@@ -33,6 +33,9 @@ public class StationBasicDto extends BaseDto {
     @ApiModelProperty(value = "场站类型")
     private String stationType;
 
+    @ApiModelProperty(value = "场站类型名称")
+    private String stationTypeName;
+
     @ApiModelProperty(value = "项目状态")
     private String stationFlag;
 

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

@@ -39,17 +39,19 @@ public class UserMapperDto {
     }
 
     public void setHeadPhoto(String headPhoto) {
-        this.headPhoto = headPhoto;
-        this.photo= headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
 
+        this.photo= headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
+       if(!this.photo.isEmpty()){
+           this.headPhoto = this.photo.get(0).getUrl();
+       }
     }
 
     public List<CommonFile> getPhoto() {
 
-        return headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
+        return photo;
     }
 
     public void setPhoto(List<CommonFile> photo) {
-        this.photo =headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
+        this.photo =photo;
     }
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.jxiop.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -133,6 +134,7 @@ public class PersonBasic extends BaseEntity {
      * 进入本单位工作时间
      */
     @TableField("station_work_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date stationWorkTime;
 
     /**

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

@@ -34,7 +34,7 @@ public class PersonSkillEducation extends BaseEntity {
      * 是否特殊工种
      */
 	@TableField("is_special_work")
-    private Integer isSpecialWork;
+    private String isSpecialWork;
 
     /**
      * 工种名称

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

@@ -43,6 +43,9 @@ public class StationBasic extends BaseEntity {
      */
     @TableField("station_type")
     private String stationType;
+
+    @TableField("station_type_name")
+    private String stationTypeName;
     /**
      * 项目状态
      */

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -11,6 +11,7 @@
         station_basic.station_master_name stationMasterName ,
         station_basic.mobile_phone mobilePhone ,
         station_basic.station_type stationType ,
+        station_basic.station_type_name stationTypeName ,
         station_basic.address address ,
         station_basic.owner_unit ownerUnit
         from station_basic
@@ -72,7 +73,7 @@
         select
         station_basic.station_name stationName ,
         station_basic.station_code stationCode,
-        station_basic.station_type stationType,
+        station_basic.station_type_name stationType,
         station_basic.station_flag stationFlag,
         station_basic.address address,
         station_basic.station_master_name stationMasterName ,

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/StationBasicController.java

@@ -72,6 +72,10 @@ public class StationBasicController extends BaseController {
 	public ResponseModel<StationBasicDto> updateBySequenceNbrStationBasic(@RequestBody StationBasic model,@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
 	    try {
             model.setSequenceNbr(sequenceNbr);
+
+
+
+
             stationBasicServiceImpl.update(model);
             return ResponseHelper.buildResponse(null);
         }catch (InnerInvokException e){

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

@@ -35,7 +35,7 @@ public class ExDataSourcesImpl implements DataSources {
     @Autowired
     private RedisUtils redisUtils;
 
-
+    private  final  String CZLX="CZLX";
     @Override
     public String[] selectList(String type, String method) throws Exception {
         String[] str = {};
@@ -46,6 +46,10 @@ public class ExDataSourcesImpl implements DataSources {
                 case "getArea":
                     str = getArea();
                     break;
+                case "getstationType":
+                    str = getstationType(CZLX);
+                    break;
+
             }
         }
         return str;
@@ -111,17 +115,43 @@ public class ExDataSourcesImpl implements DataSources {
         if (!data.isEmpty()) {
             for (ListCompanyModel datum : data) {
                 datas.add(datum.getCompanyName() + "@" + datum.getSequenceNbr());
-//                if (datum.getChildren() != null) {
-//                    this.getCompanyModel(datum.getChildren(),datas);
-//                }
             }
-
         }
     return datas;
 
     }
 
 
+    private String[]  getstationType(String dictCode) {
+        FeignClientResult<List<DictionarieValueModel>> Model =Systemctl.dictionarieClient.dictValues(dictCode);
+        List<DictionarieValueModel> user=new ArrayList<>();
+
+        if (!ObjectUtils.isEmpty(Model)) {
+            if(Model.getStatus()==200){
+                user = Model.getResult();
+            }else{
+                throw new RuntimeException(Model.getMessage());
+            }
+        }
+        String[] str = null;
+        List<String> collect=new ArrayList<>();
+
+        this.getstationTypeList(user,collect);
+        str = collect.toArray(new String[collect.size()]);
+
+        return str;
+    }
+    public List<String> getstationTypeList( List<DictionarieValueModel>  data,List<String> datas) {
+
+
+        if (!data.isEmpty()) {
+            for (DictionarieValueModel datum : data) {
+                datas.add(datum.getDictDataValue() + "@" + datum.getDictDataKey());
+            }
+        }
+        return datas;
+
+    }
 
 
     private String[] getDataDictionary(String type) {

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

@@ -132,6 +132,13 @@ public class ExcelServiceImpl {
                CompanyModel companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(type[1]));
                fireChemical.setAreaCode(companyModel.getCompanyCode());
            }
+           if (fireChemical.getStationType() != null) {
+               String[] type = fireChemical.getStationType().split("@");
+               fireChemical.setStationTypeName(type[0]);
+               fireChemical.setStationType(type[1]);
+           }
+
+
 
            //平台增加场站
            CompanyModel companyModeldata=new CompanyModel();
@@ -141,6 +148,7 @@ public class ExcelServiceImpl {
            companyModeldata.setParentId(Long.valueOf(fireChemical.getArea()));
            companyModeldata.setCompanyCode(fireChemical.getStationCode());
            companyModeldata= this.addCompanyModel(companyModeldata);
+
            fireChemical.setProjectOrgCode(companyModeldata.getOrgCode());
            fireChemical.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
            excelEntityList.add(fireChemical);

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

@@ -207,7 +207,13 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         PersonSkillEducation personSkillEducation = new PersonSkillEducation();
         BeanUtils.copyProperties(personUser, personSkillEducation);
         personSkillEducation.setPersonId(personBasic.getSequenceNbr());
+
+
+        PersonSkillEducation personSkillEducationd= personSkillEducationService.getOne(new QueryWrapper<PersonSkillEducation>().eq("person_id", personBasic.getSequenceNbr()));
+        personSkillEducation.setSequenceNbr(personSkillEducationd.getSequenceNbr());
         personSkillEducationService.updateById(personSkillEducation);
+
+
         //人员资质信息
         personCertificateService.updateById(personCertificate);
         //人员账号信息

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

@@ -15,6 +15,8 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,7 +27,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
+import com.yeejoin.amos.feign.systemctl.Systemctl;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,6 +48,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     PersonBasicServiceImpl personBasicServiceImpl;
     @Autowired
     StationBasicMapper stationBasicMapper;
+
+    private  final  String CZLX="CZLX";
     /**
      * 分页查询
      */
@@ -111,6 +115,10 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         stationBasic.setAreaCode(companyModel.getCompanyCode());
         stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
         stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
+        //获取类型名称
+        String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
+        stationBasic.setStationTypeName(typeName);
+
         //场站基本信息
         this.save(stationBasic);
         if(CollectionUtils.isEmpty(list)){
@@ -155,7 +163,19 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
     }
 
 
+    private String queryByCode(String dictCode,String dictDataKey) {
+        FeignClientResult<DictionarieValueModel> Model =Systemctl.dictionarieClient.value(dictCode,dictDataKey);
+        DictionarieValueModel user=new DictionarieValueModel();
 
+        if (!ObjectUtils.isEmpty(Model)) {
+            if(Model.getStatus()==200){
+                user = Model.getResult();
+            }else{
+                throw new RuntimeException(Model.getMessage());
+            }
+        }
+        return user.getDictDataValue();
+    }
 
 
 
@@ -202,6 +222,11 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         stationBasic.setAreaCode(companyModel.getCompanyCode());
         stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
         stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
+
+        //获取类型名称
+        String typeName=this.queryByCode(CZLX,stationBasic.getStationType());
+        stationBasic.setStationTypeName(typeName);
+
         //场站基本信息
         stationBasicMapper.updateById(stationBasic);