档案新增+录用审批归档流程变更

zjugis-business/src/main/java/com/zjugis/business/converter/staff/StaffConvert.java

@@ -1,9 +1,5 @@
 package com.zjugis.business.converter.staff;
 
-import com.zjugis.business.converter.recruit.RecruitConvert;
-import com.zjugis.business.flow.recruit.controller.vo.RecruitVO;
-import com.zjugis.business.flow.recruit.entity.RecruitDO;
-import com.zjugis.business.flow.staff.controller.vo.StaffPageVO;
 import com.zjugis.business.flow.staff.controller.vo.StaffVO;
 import com.zjugis.business.flow.staff.entity.StaffDO;
 import com.zjugis.business.flow.staff.entity.StaffFamilyDetailDO;

zjugis-business/src/main/java/com/zjugis/business/flow/interview/event/InterviewEvent.java

@@ -101,9 +101,6 @@ public class InterviewEvent extends BaseController {
                 entity.setFlowStatus(FLOW_FINISHED);
                 entity.setFlowFinishtime(LocalDateTime.now());
                 interviewService.update(entity);
-                //新建OA账号和档案的基本信息
-//                staffApi.insertStaff();
-
                 return ok("true");
             } else {
                 throw new BusinessException("执行事件出错，请联系管理员！");

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/StaffApi.java

@@ -27,10 +27,6 @@ public interface StaffApi {
 
     String PREFIX = ApiConstants.PREFIX + "/staff";
 
-    @PostMapping(PREFIX + "/insert")
-    @Operation(summary = "新增员工档案")
-    CommonResult<String> insertStaff(@Valid @RequestBody StaffRecordsDTO reqDTO);
-
     @PostMapping(PREFIX + "/changeState")
     @Operation(summary = "更新员工状态")
     CommonResult<String> updateStaffState(@Valid @RequestBody StaffStateDTO dto);

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/dto/StaffRecordsDTO.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -20,282 +21,87 @@ import java.util.List;
 @Data
 public class StaffRecordsDTO {
 
-    @Schema(description = "主键ID")
     private String id;
 
 
     /**
      * 用户ID
      */
-    @Schema(description = "用户ID")
     private String userId;
 
     /**
-     * 状态
+     * 用户名
      */
-    @Schema(description = "状态 1-实习;2-试用;3-正式;4-离职")
-    private Integer state;
-
-
-    /**
-     * 政治面貌
-     */
-    @Schema(description = "政治面貌")
-    private Integer zzmm;
-
-
-    /**
-     * 户口性质
-     */
-    @Schema(description = "户口性质")
-    private Integer hkxz;
-
-    /**
-     * 毕业学校
-     */
-    @Schema(description = "毕业学校")
-    private String byxx;
-
-    /**
-     * 毕业时间
-     */
-    @Schema(description = "毕业时间")
-    private LocalDateTime bysj;
-
-
-    /**
-     * 最高学历
-     */
-    @Schema(description = "最高学历")
-    private Integer zgxl;
-
-
-    /**
-     * 专业
-     */
-    @Schema(description = "专业")
-    private String major;
-
-    /**
-     * 参加工作时间
-     */
-    @Schema(description = "参加工作时间")
-    private LocalDateTime cjgzsj;
-
-    /**
-     * 入公司时间
-     */
-    @Schema(description = "入公司时间")
-    private LocalDateTime rgssj;
-
-    /**
-     * 离职时间
-     */
-    @Schema(description = "离职时间")
-    private LocalDateTime lzsj;
-
-    /**
-     * 性别
-     */
-    @Schema(description = "性别")
-    private Integer sex;
-
-
-    /**
-     * 民族
-     */
-    @Schema(description = "民族")
-    private String nation;
-
-
-    /**
-     * 出生日期
-     */
-    @Schema(description = "出生日期")
-    private LocalDateTime birthday;
-
-
-    /**
-     * 身份证号码
-     */
-    @Schema(description = "身份证号码")
-    private String cardid;
-
-
-    /**
-     * 户口所在地
-     */
-    @Schema(description = "户口所在地")
-    private String hkszd;
-
-
-    /**
-     * 婚姻状况
-     */
-    @Schema(description = "婚姻状况")
-    private Integer hyzk;
-
-
-    /**
-     * 手机
-     */
-    @Schema(description = "手机")
-    private String mobilePhone;
-
-
-    /**
-     * 指导人ID
-     */
-    @Schema(description = "指导人ID")
-    private String zdr;
-
-
-    /**
-     * 紧急联系人号码
-     */
-    @Schema(description = "紧急联系人号码")
-    private String jjlxrhm;
-
-
-    /**
-     * 紧急联系人姓名
-     */
-    @Schema(description = "紧急联系人姓名")
-    private String jjlxrxm;
-
-    /**
-     * 紧急联系人关系
-     */
-    @Schema(description = "紧急联系人关系")
-    private Integer jjlxrgx;
-
-
-    /**
-     * 所属部门
-     */
-    @Schema(description = "所属部门")
-    private String ssbm;
-
-    /**
-     * 担任职务
-     */
-    @Schema(description = "担任职务")
-    private String drzw;
+    private String nickname;
 
     /**
-     * 职称
+     * 部门ID
      */
-    @Schema(description = "职称")
-    private String zc;
-
+    private String deptId;
 
     /**
-     * 转正时间
+     * 部门名称
      */
-    @Schema(description = "转正时间")
-    private LocalDateTime zzsj;
-
+    private String deptName;
 
     /**
-     * 合同到期时间
+     * 应聘岗位
      */
-    @Schema(description = "合同到期时间")
-    private LocalDateTime htdqs;
-
+    private String ypgw;
 
     /**
-     * 签订公司ID
+     * 面试时间
      */
-    @Schema(description = "签订公司ID")
-    private String qdgsid;
+    private LocalDateTime mssj;
 
 
     /**
-     * 能力等级
+     * 用工性质
      */
-    @Schema(description = "能力等级")
-    private String nldj;
-
+    private String ygxz;
 
     /**
-     * 员工姓名
+     * 等级初定
      */
-    @Schema(description = "员工姓名")
-    private String nickname;
-
+    private String djcd;
 
     /**
-     * 部门名称
+     * 拟定劳务期 （年）
      */
-    @Schema(description = "部门名称")
-    private String deptName;
-
+    private Integer lwq;
 
     /**
-     * 部门Id
+     * 试用期（月）
      */
-    @Schema(description = "部门Id")
-    private String deptId;
-
+    private Integer syq;
 
     /**
-     * 签订公司
+     * 分配岗位
      */
-    @Schema(description = "签订公司")
-    private String qdgs;
-
+    private String fpgw;
     /**
-     * 指导人名称
+     * 报到日期
      */
-    @Schema(description = "指导人名称")
-    private String zdrmc;
+    private LocalDateTime bdrq;
 
     /**
-     * 登录名称(员工工号)
+     * 登录名称
      */
-    @Schema(description = "登录名称(员工工号)")
     private String loginName;
 
     /**
-     * 开户银行
+     * 身份证号
      */
-    @Schema(description = "开户银行")
-    private String khyh;
-
+    private String sfzh;
 
     /**
-     * 银行账号
-     */
-    @Schema(description = "银行账号")
-    private String yhzh;
-
-    private String hz;
-
-    /**
-     * 初始司领
-     */
-    @Schema(description = "初始司领")
-    private Integer cssl;
-
-    /**
-     * 年假
+     * 性别
      */
-    @Schema(description = "年假")
-    private Integer nj;
-
-    @Schema(description = "合同签订时间")
-    private LocalDateTime htqdsj;
-
+    private Integer sex;
     /**
-     * 试用期（月）
+     * 手机号
      */
-    @Schema(description = "试用期（月）")
-    private Integer syq;
+    private String mobile;
 
-    /**
-     * 亲属列表
-     */
-    @Schema(description = "亲属列表")
-    private List<StaffFamilyDetailDTO> familyList;
 
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/api/staff/StaffApiImpl.java

@@ -28,10 +28,6 @@ public class StaffApiImpl implements StaffApi {
     @Resource
     private RecordsService recordsService;
 
-    @Override
-    public CommonResult<String> insertStaff(StaffRecordsDTO dto) {
-        return success(/*recordsService.insertStaff(dto)*/);
-    }
 
     @Override
     public CommonResult<String> updateStaffState(StaffStateDTO dto) {

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/staff/RecordsServiceImpl.java

@@ -336,8 +336,6 @@ public class RecordsServiceImpl implements RecordsService {
             throw new RuntimeException(result.getMsg());
         }
 
-        //亲属列表更新
-        updateFamilyDetail(staffRecordSDO.getId(), dto.getFamilyList());
 
         return user.getUserId();
     }