人员管理需求变更

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

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 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;
 
 /**
@@ -16,12 +18,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="PersonAccountDto", description="人员基本信息")
-public class PersonAccountDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
+@ApiModel(value = "PersonAccountDto", description = "人员基本信息")
+public class PersonAccountDto extends BaseDto {
 
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "平台user_id")
@@ -32,13 +32,41 @@ public class PersonAccountDto  extends BaseDto {
 
     @ApiModelProperty(value = "用户角色")
     private String roles;
-    
 
     @ApiModelProperty(value = "密码")
-    private String  password;
+    private String password;
+
     @ApiModelProperty(value = "二次密码")
-    private String  secondaryPassword;
+    private String secondaryPassword;
+
+    @ApiModelProperty(value = "部门id")
+    private Long departmentId;
+
+    @ApiModelProperty(value = "所属场站id")
+    private Long projectId;
+
+    @ApiModelProperty(value = "工作所在地key")
+    private String workPlaceKey;
+
+    @ApiModelProperty(value = "进入本单位工作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date stationWorkTime;
+
+
+    @ApiModelProperty(value = "岗位")
+    private String postName;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "工号")
+    private String jobNumber;
+
+    @ApiModelProperty(value = "证件类型(0-身份证)")
+    private String idType;
 
+    @ApiModelProperty(value = "证件编号")
+    private String idNumber;
     /**
      * 应用
      */

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

@@ -24,9 +24,6 @@ public class PersonAscriptionDto  extends BaseDto {
     @ApiModelProperty(value = "人员信息id")
     private Long personId;
 
-    @ApiModelProperty(value = "进入本单位工作时间")
-    private Date stationWorkTime;
-
     @ApiModelProperty(value = "所在项目id")
     private Long projectId;
     private String projectName;
@@ -34,6 +31,9 @@ public class PersonAscriptionDto  extends BaseDto {
     private Long departmentId;
     private String departmentName;
 
+    @ApiModelProperty(value = "进入本单位工作时间")
+    private Date stationWorkTime;
+
     @ApiModelProperty(value = "工作所在地key")
     private String workPlaceKey;
 

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

@@ -25,21 +25,9 @@ public class PersonBasicDto  extends BaseDto {
    private static final long serialVersionUID = 1L;
 
 
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
     @ApiModelProperty(value = "性别( 0-男 1-女 )")
     private String sex;
 
-    @ApiModelProperty(value = "工号")
-    private String jobNumber;
-
-    @ApiModelProperty(value = "证件类型(0-身份证)")
-    private String idType;
-
-    @ApiModelProperty(value = "证件编号")
-    private String idNumber;
-
     @ApiModelProperty(value = "生日")
     private Date birthday;
 
@@ -91,4 +79,13 @@ public class PersonBasicDto  extends BaseDto {
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<CommonFile> backCertificatePhoto;
 
+    @ApiModelProperty(value = "进入本单位工作时间")
+    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/PersonUser.java

@@ -21,21 +21,9 @@ public class PersonUser {
    /**
     * 基本信息
     * */
-   @ApiModelProperty(value = "姓名")
-   private String name;
-
     @ApiModelProperty(value = "性别( 0-男 1-女 )")
     private String sex;
 
-    @ApiModelProperty(value = "工号")
-    private String jobNumber;
-
-    @ApiModelProperty(value = "证件类型(0-身份证)")
-    private String idType;
-
-    @ApiModelProperty(value = "证件编号")
-    private String idNumber;
-
     @ApiModelProperty(value = "生日")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
@@ -88,26 +76,6 @@ public class PersonUser {
     @ApiModelProperty(value = "证件照片反面")
     @TableField(typeHandler = FastjsonTypeHandler.class)
     private List<CommonFile> backCertificatePhoto;
-    /**
-     *归属信息
-     *
-     * */
-
-    @ApiModelProperty(value = "进入本单位工作时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date stationWorkTime;
-
-    @ApiModelProperty(value = "所在项目id")
-    private Long projectId;
-    @ApiModelProperty(value = "部门id")
-    private Long departmentId;
-
-    @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/entity/PersonAccount.java

@@ -76,5 +76,44 @@ public class PersonAccount extends BaseEntity {
 	@TableField("sc_user_category")
     private String scUserCategory;
 
+    /**
+     *所属场站
+     */
+    @TableField("project_id")
+    private Long projectId;
+
+    @TableField("project_name")
+    private String projectName;
+
+    /**
+     * 部门班组
+     */
+    @TableField("department_id")
+    private Long departmentId;
+    @TableField("department_name")
+    private String departmentName;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+    /**
+     * 工号
+     */
+    @TableField("job_number")
+    private String jobNumber;
+
+    /**
+     * 证件类型(0-身份证)
+     */
+    @TableField("ID_type")
+    private String idType;
+
+    /**
+     * 证件编号
+     */
+    @TableField("ID_number")
+    private String idNumber;
 
 }

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

@@ -29,11 +29,7 @@ public class PersonAscription extends BaseEntity {
     private Long personId;
 
 
-    /**
-     * 进入本单位工作时间
-     */
-	@TableField("station_work_time")
-    private Date stationWorkTime;
+
 
     /**
      *所属场站
@@ -54,6 +50,12 @@ public class PersonAscription extends BaseEntity {
 
 
     /**
+     * 进入本单位工作时间
+     */
+    @TableField("station_work_time")
+    private Date stationWorkTime;
+
+    /**
      * 工作所在地key
      */
 	@TableField("work_place_key")

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

@@ -25,11 +25,7 @@ public class PersonBasic extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 姓名
-     */
-	@TableField("name")
-    private String name;
+
 
     /**
      * 性别( 0-男 1-女 )
@@ -38,24 +34,6 @@ public class PersonBasic extends BaseEntity {
     private String sex;
 
     /**
-     * 工号
-     */
-	@TableField("job_number")
-    private String jobNumber;
-
-    /**
-     * 证件类型(0-身份证)
-     */
-	@TableField("ID_type")
-    private String idType;
-
-    /**
-     * 证件编号
-     */
-	@TableField("ID_number")
-    private String idNumber;
-
-    /**
      * 生日
      */
 	@TableField("birthday")
@@ -151,5 +129,23 @@ public class PersonBasic extends BaseEntity {
     @TableField("org_code")
     private String orgCode;
 
+    /**
+     * 进入本单位工作时间
+     */
+    @TableField("station_work_time")
+    private Date stationWorkTime;
+
+    /**
+     * 工作所在地key
+     */
+    @TableField("work_place_key")
+    private String workPlaceKey;
+
+
+    /**
+     * 岗位
+     */
+    @TableField("post_name")
+    private String postName;
 
 }

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

@@ -12,12 +12,10 @@
         person_basic.`name` name,
         person_basic.sex,
         person_basic.phone phone,
-        person_ascription.project_name projectName,
-        person_ascription.post_name postName,
+        person_account.project_name projectName,
+        person_account.post_name postName,
         person_account.account_name accountName
         from person_basic
-        LEFT JOIN person_ascription
-        on person_ascription.person_id=person_basic.sequence_nbr
         LEFT JOIN person_account
         on person_account.person_id=person_basic.sequence_nbr
         <where>
@@ -29,7 +27,7 @@
                 AND person_account.account_name like concat('%',#{accountName},'%')
             </if>
             <if test="projectName != null and projectName != ''">
-                AND person_ascription.project_name like concat('%',#{projectName},'%')
+                AND person_account.project_name like concat('%',#{projectName},'%')
             </if>
         </where>
         ORDER BY  person_basic.rec_date DESC
@@ -41,8 +39,6 @@
         select
         person_basic.sequence_nbr sequenceNbr
         from person_basic
-        LEFT JOIN person_ascription
-        on person_ascription.person_id=person_basic.sequence_nbr
         LEFT JOIN person_account
         on person_account.person_id=person_basic.sequence_nbr
         <where>
@@ -54,7 +50,7 @@
                 AND person_account.account_name like concat('%',#{accountName},'%')
             </if>
             <if test="projectName != null and projectName != ''">
-                AND person_ascription.project_name like concat('%',#{projectName},'%')
+                AND person_account.project_name like concat('%',#{projectName},'%')
             </if>
         </where>
     </select>
@@ -68,10 +64,6 @@
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>;
-        delete from person_ascription where person_id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>;
         delete from person_certificate where person_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}

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

@@ -91,11 +91,11 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //角色
         Map<Long,List<Long>> map=new HashMap<>();
         List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
-        if(personUser.getDepartmentId()!=null){
+        if(personAccount.getDepartmentId()!=null){
 
-            map.put(personUser.getDepartmentId(),cdids);
+            map.put(personAccount.getDepartmentId(),cdids);
         }else{
-            map.put(personUser.getProjectId(),cdids);
+            map.put(personAccount.getProjectId(),cdids);
         }
         usd.setOrgRoleSeqs(map);
         //密码
@@ -103,7 +103,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //二次密码
         usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), "qaz"));
         //用户名
-        usd.setRealName(personUser.getName());
+        usd.setRealName(personAccount.getName());
         //账号
         usd.setUserName(personAccount.getAccountName());
         usd.setLockStatus("UNLOCK");
@@ -111,12 +111,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         AgencyUserModel agencyUserModel=this.setcreateUser(usd);
         //查询部门
         DepartmentModel departmentModel=null;
-        if(personUser.getDepartmentId()!=null){
-            departmentModel= this.getdepartmentModel(personUser.getDepartmentId());
+        if(personAccount.getDepartmentId()!=null){
+            departmentModel= this.getdepartmentModel(personAccount.getDepartmentId());
         }
         CompanyModel companyModel=new CompanyModel();
         //单位
-        companyModel=this.getCompanyModel(personUser.getProjectId());
+        companyModel=this.getCompanyModel(personAccount.getProjectId());
         //人员基础信息
         PersonBasic personBasic = new PersonBasic();
         BeanUtils.copyProperties(personUser,personBasic);
@@ -126,14 +126,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
             personBasic.setOrgCode(companyModel.getOrgCode());
         }
         this.baseMapper.insert(personBasic);
-        //人员归属信息
-        PersonAscription personAscription = new PersonAscription();
-        BeanUtils.copyProperties(personUser,personAscription);
-        personAscription.setPersonId(personBasic.getSequenceNbr());
-        personAscription.setDepartmentName(departmentModel.getDepartmentName());
-        personAscription.setProjectName(companyModel.getCompanyName());
-        personAscriptionService.save(personAscription);
-        //人员归属信息
+        //人员技能学历信息
         PersonSkillEducation personSkillEducation = new PersonSkillEducation();
         BeanUtils.copyProperties(personUser,personSkillEducation);
         personSkillEducation.setPersonId(personBasic.getSequenceNbr());
@@ -144,6 +137,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //人员账号信息
         personAccount.setPersonId(personBasic.getSequenceNbr());
         personAccount.setPuserId(agencyUserModel.getUserId());
+        personAccount.setDepartmentName(departmentModel.getDepartmentName());
+        personAccount.setProjectName(companyModel.getCompanyName());
         personAccountService.save(personAccount);
     }
 
@@ -169,11 +164,11 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //角色
         Map<Long,List<Long>> map=new HashMap<>();
         List<Long> cdids = personAccount.getRoles().stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); //测点数组
-        if(personUser.getDepartmentId()!=null){
+        if(personAccount.getDepartmentId()!=null){
 
-            map.put(personUser.getDepartmentId(),cdids);
+            map.put(personAccount.getDepartmentId(),cdids);
         }else{
-            map.put(personUser.getProjectId(),cdids);
+            map.put(personAccount.getProjectId(),cdids);
         }
         usd.setOrgRoleSeqs(map);
         //密码
@@ -181,7 +176,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //二次密码
         usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), "qaz"));
         //用户名
-        usd.setRealName(personUser.getName());
+        usd.setRealName(personAccount.getName());
         //账号
         usd.setUserName(personAccount.getAccountName());
         usd.setLockStatus("UNLOCK");
@@ -190,12 +185,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         AgencyUserModel agencyUserModel=this.updateuser(personAccount.getPuserId(),usd);
         //查询部门
         DepartmentModel departmentModel=null;
-        if(personUser.getDepartmentId()!=null){
-            departmentModel= this.getdepartmentModel(personUser.getDepartmentId());
+        if(personAccount.getDepartmentId()!=null){
+            departmentModel= this.getdepartmentModel(personAccount.getDepartmentId());
         }
         CompanyModel companyModel=new CompanyModel();
         //单位
-        companyModel=this.getCompanyModel(personUser.getProjectId());
+        companyModel=this.getCompanyModel(personAccount.getProjectId());
 
         //人员基础信息
         PersonBasic personBasic = new PersonBasic();
@@ -207,13 +202,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
             personBasic.setOrgCode(companyModel.getOrgCode());
         }
         this.personBasicMapper.updateById(personBasic);
-        //人员归属信息
-        PersonAscription personAscription = new PersonAscription();
-        BeanUtils.copyProperties(personUser, personAscription);
-        personAscription.setPersonId(personBasic.getSequenceNbr());
-        personAscription.setDepartmentName(departmentModel.getDepartmentName());
-        personAscription.setProjectName(companyModel.getCompanyName());
-        personAscriptionService.updateById(personAscription);
+
 
         //人员归属信息
         PersonSkillEducation personSkillEducation = new PersonSkillEducation();
@@ -223,6 +212,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //人员资质信息
         personCertificateService.updateById(personCertificate);
         //人员账号信息
+        personAccount.setPersonId(sequenceNbr);
+        personAccount.setDepartmentName(departmentModel.getDepartmentName());
+        personAccount.setProjectName(companyModel.getCompanyName());
         personAccountService.updateById(personAccount);
         return model;
     }
@@ -238,29 +230,24 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         PersonBasic personBasic = this.getOne(wrapper1);
         BeanUtils.copyProperties(personBasic,personUser);
 
-        QueryWrapper<PersonAscription> wrapper2 = new QueryWrapper();
-        wrapper2.eq("person_id", sequenceNbr);
-        //人员归属信息
-        PersonAscription personAscription = personAscriptionService.getOne(wrapper2);
-        BeanUtils.copyProperties(personAscription,personUser);
 
-        //人员归属信息
-        QueryWrapper<PersonSkillEducation> wrapper3 = new QueryWrapper();
-        wrapper3.eq("person_id", sequenceNbr);
-        PersonSkillEducation personSkillEducation =personSkillEducationService.getOne(wrapper3);
+        //人员技能学历信息
+        QueryWrapper<PersonSkillEducation> wrapper2 = new QueryWrapper();
+        wrapper2.eq("person_id", sequenceNbr);
+        PersonSkillEducation personSkillEducation =personSkillEducationService.getOne(wrapper2);
         BeanUtils.copyProperties(personSkillEducation,personUser);
 
 
-        QueryWrapper<PersonCertificate> wrapper4 = new QueryWrapper();
-        wrapper4.eq("person_id", sequenceNbr);
+        QueryWrapper<PersonCertificate> wrapper3 = new QueryWrapper();
+        wrapper3.eq("person_id", sequenceNbr);
         //人员资质信息
-        PersonCertificate personCertificate = personCertificateService.getOne(wrapper4);
+        PersonCertificate personCertificate = personCertificateService.getOne(wrapper3);
 
 
-        QueryWrapper<PersonAccount> wrapper5 = new QueryWrapper();
-        wrapper5.eq("person_id", sequenceNbr);
+        QueryWrapper<PersonAccount> wrapper4 = new QueryWrapper();
+        wrapper4.eq("person_id", sequenceNbr);
         //人员账号信息
-        PersonAccount personAccount= personAccountService.getOne(wrapper5);
+        PersonAccount personAccount= personAccountService.getOne(wrapper4);
         personDto.setPersonUser(personUser);
         personDto.setPersonCertificate(personCertificate);
         personDto.setPersonAccount(personAccount);