人员管理增删改代码提交

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.CommonFile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 人员基本信息
@@ -77,12 +80,15 @@ public class PersonBasicDto  extends BaseDto {
     private String orgCode;
 
     @ApiModelProperty(value = "人员头像")
-    private String headPhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> headPhoto;
 
     @ApiModelProperty(value = "证件照片正面")
-    private String frontCertificatePhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> frontCertificatePhoto;
 
     @ApiModelProperty(value = "证件照片反面")
-    private String backCertificatePhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> backCertificatePhoto;
 
 }

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.CommonFile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 人员资质
@@ -46,6 +50,7 @@ public class PersonCertificateDto  extends BaseDto {
     private String certificateGrade;
 
     @ApiModelProperty(value = "证书附件")
-    private String certificateAttachment;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> certificateAttachment;
 
 }

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

 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.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @description:
@@ -20,18 +25,19 @@ public class PersonUser {
    private String name;
 
     @ApiModelProperty(value = "性别( 0-男 1-女 )")
-    private Integer sex;
+    private String sex;
 
     @ApiModelProperty(value = "工号")
     private String jobNumber;
 
     @ApiModelProperty(value = "证件类型(0-身份证)")
-    private Integer idType;
+    private String idType;
 
     @ApiModelProperty(value = "证件编号")
     private String idNumber;
 
     @ApiModelProperty(value = "生日")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
 
     @ApiModelProperty(value = "年龄")
@@ -65,6 +71,7 @@ public class PersonUser {
     private Integer weight;
 
     @ApiModelProperty(value = "参加工作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date workTime;
 
     @ApiModelProperty(value = "组织机构id")
@@ -74,16 +81,19 @@ public class PersonUser {
     private String headPhoto;
 
     @ApiModelProperty(value = "证件照片正面")
-    private String frontCertificatePhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> frontCertificatePhoto;
 
     @ApiModelProperty(value = "证件照片反面")
-    private String backCertificatePhoto;
+    @TableField(typeHandler = FastjsonTypeHandler.class)
+    private List<CommonFile> backCertificatePhoto;
     /**
      *归属信息
      *
      * */
 
     @ApiModelProperty(value = "进入本单位工作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date stationWorkTime;
 
     @ApiModelProperty(value = "所在项目id")
@@ -103,7 +113,7 @@ public class PersonUser {
      * */
 
     @ApiModelProperty(value = "是否特殊工种")
-    private Integer isSpecialWork;
+    private String isSpecialWork;
 
     @ApiModelProperty(value = "技能鉴定工种key")
     private String workTypeKey;

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

@@ -2,12 +2,14 @@ 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.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 人员基本信息
@@ -39,8 +41,8 @@ public class PersonAccount extends BaseEntity {
     /**
      * 用户角色
      */
-	@TableField("roles")
-    private String roles;
+	@TableField(value="roles", typeHandler = FastjsonTypeHandler.class)
+    private List<String> roles;
 
 
     /**
@@ -53,8 +55,8 @@ public class PersonAccount extends BaseEntity {
     /**
      * 应用
      */
-    @TableField("application")
-    private String application;
+    @TableField(value="application", typeHandler = FastjsonTypeHandler.class)
+    private List<String> application;
 
     @TableField("password")
     private String  password;
@@ -75,7 +77,4 @@ public class PersonAccount extends BaseEntity {
     private String scUserCategory;
 
 
-
-
-
 }

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

@@ -2,6 +2,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.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -128,19 +129,19 @@ public class PersonBasic extends BaseEntity {
     /**
      * 人员头像
      */
-	@TableField("head_photo")
+	@TableField(value="head_photo",typeHandler = FastjsonTypeHandler.class)
     private String headPhoto;
 
     /**
      * 证件照片正面
      */
-	@TableField("front_certificate_photo")
+	@TableField(value = "front_certificate_photo",typeHandler = FastjsonTypeHandler.class)
     private String frontCertificatePhoto;
 
     /**
      * 证件照片反面
      */
-	@TableField("back_certificate_photo")
+	@TableField(value = "back_certificate_photo",typeHandler = FastjsonTypeHandler.class)
     private String backCertificatePhoto;
 
     /**

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

@@ -2,6 +2,8 @@ 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 lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +40,7 @@ public class PersonCertificate extends BaseEntity {
      * 取证时间
      */
 	@TableField("certificate_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date certificateTime;
 
     /**
@@ -73,7 +76,7 @@ public class PersonCertificate extends BaseEntity {
     /**
      * 证书附件
      */
-	@TableField("certificate_attachment")
+	@TableField(value="certificate_attachment",typeHandler = FastjsonTypeHandler.class)
     private String certificateAttachment;
 
     /**

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

@@ -40,15 +40,17 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
     @Autowired
     PrivilegeFeignClient privilegeFeignClient;
 
-    //人员基本信息service
-    PersonBasicServiceImpl personBasicService;
     //人员账号信息service
+    @Autowired
     PersonAccountServiceImpl personAccountService;
     //人员归属信息service
+    @Autowired
     PersonAscriptionServiceImpl personAscriptionService;
     //人员资质信息service
+    @Autowired
     PersonCertificateServiceImpl personCertificateService;
     //人员教育信息
+    @Autowired
     PersonSkillEducationServiceImpl personSkillEducationService;
 
     /**
@@ -84,7 +86,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //人员基础信息
         PersonBasic personBasic = new PersonBasic();
         BeanUtils.copyProperties(personUser,personBasic);
-        personBasicService.save(personBasic);
+        this.baseMapper.insert(personBasic);
         //人员归属信息
         PersonAscription personAscription = new PersonAscription();
         BeanUtils.copyProperties(personUser,personAscription);