入职+档案字段重新调整

zjugis-business/src/main/java/com/zjugis/business/flow/staff/dao/StaffDAO.java

@@ -34,8 +34,6 @@ public interface StaffDAO extends BaseMapperX<StaffDO> {
                 .eqIfPresent(StaffDO::getZzmm, dto.getZzmm())
                 .eqIfPresent(StaffDO::getHkxz, dto.getHkxz())
                 .likeIfPresent(StaffDO::getMajor, dto.getMajor())
-                .eqIfPresent(StaffDO::getPyxs, dto.getPyxs())
-                .eqIfPresent(StaffDO::getSfytd, dto.getSfytd())
                 .eqIfPresent(StaffDO::getFlowStatus, dto.getStatus())
                 .orderByDesc(StaffDO::getLatestModifyTime)
         );

zjugis-business/src/main/java/com/zjugis/business/flow/staff/entity/StaffDO.java

@@ -63,11 +63,6 @@ public class StaffDO extends BaseEntity {
      */
     private Integer state;
 
-    /**
-     * 社保缴纳处
-     */
-    private String sbjnc;
-
     /**
      * 性别
      */
@@ -93,10 +88,6 @@ public class StaffDO extends BaseEntity {
      */
     private Integer zzmm;
 
-    /**
-     * 身体状况
-     */
-    private String stzk;
 
     /**
      * 户口所在地
@@ -108,20 +99,12 @@ public class StaffDO extends BaseEntity {
      */
     private Integer hkxz;
 
-    /**
-     * 户口邮政编码
-     */
-    private String hkyzbm;
-
     /**
      * 现居住地址
      */
     private String xjzdz;
 
-    /**
-     * 现邮政编码
-     */
-    private String xyzbm;
+
 
     /**
      * 婚姻状况
@@ -143,16 +126,6 @@ public class StaffDO extends BaseEntity {
      */
     private Integer zgxl;
 
-    /**
-     * 英语等级
-     */
-    private String yydj;
-
-    /**
-     * 技能证书
-     */
-    private String jnzs;
-
     /**
      * 参加工作时间
      */
@@ -163,16 +136,6 @@ public class StaffDO extends BaseEntity {
      */
     private String major;
 
-    /**
-     * 籍贯
-     */
-    private String jg;
-
-    /**
-     * 邮政编码
-     */
-    private String yzbm;
-
     /**
      * 手机
      */
@@ -198,11 +161,6 @@ public class StaffDO extends BaseEntity {
      */
     private Integer jjlxrgx;
 
-    /**
-     * 基本情况备注
-     */
-    private String jbqkbz;
-
     /**
      * 所属部门
      */
@@ -243,71 +201,6 @@ public class StaffDO extends BaseEntity {
      */
     private String nldj;
 
-    /**
-     * 是否已调档
-     */
-    private Integer sfytd;
-
-    /**
-     * 聘用形式
-     */
-    private Integer pyxs;
-
-    /**
-     * 如未调档档案所在地
-     */
-    private String rwtddaszd;
-
-    /**
-     * 入公司备注
-     */
-    private String rgsbz;
-
-    /**
-     * 兴趣爱好
-     */
-    private String xqah;
-
-    /**
-     * 技能特长
-     */
-    private String jntc;
-
-    /**
-     * 成果奖励
-     */
-    private String cgjl;
-
-    /**
-     * 自我评价
-     */
-    private String zwpj;
-
-    /**
-     * 个人简历文件ID
-     */
-    private String grjlwjid;
-
-    /**
-     * 身份证文件ID
-     */
-    private String sfzwjid;
-
-    /**
-     * 照片文件ID
-     */
-    private String zpwjid;
-
-    /**
-     * 合同文件ID
-     */
-    private String htwjid;
-
-    /**
-     * 学历证书复印件文件ID
-     */
-    private String xlzsfyjwjid;
-
     /**
      * 员工姓名
      */
@@ -334,7 +227,6 @@ public class StaffDO extends BaseEntity {
      */
     private LocalDateTime lzsj;
 
-    private String hz;
 
     /**
      * 开户银行

zjugis-business/src/main/resources/templates/Staff/index.ftl

@@ -218,16 +218,13 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                             </td>
 
                             <td class="th">
-                                <div class="form-label">是否已调档：</div>
+                                <div class="form-label">参加工作时间：</div>
                             </td>
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-select" name="createReqVO$sfytd"
-                                             data='${td_type!}' value="${formEntity.sfytd!}">
-                                            <div class="z-inputselect-bar">
-                                                <span></span><i></i>
-                                            </div>
+                                        <div class="z-comp-date" name="createReqVO$cjgzsj">
+                                            <input type="text" value="${(formEntity.cjgzsj?date)!}">
                                         </div>
                                     </div>
                                 </div>
@@ -237,18 +234,7 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
 
                         <tr>
 
-                            <td class="th">
-                                <div class="form-label">参加工作时间：</div>
-                            </td>
-                            <td>
-                                <div class="form-group">
-                                    <div class="form-item">
-                                        <div class="z-comp-date" name="createReqVO$cjgzsj">
-                                            <input type="text" value="${(formEntity.cjgzsj?date)!}">
-                                        </div>
-                                    </div>
-                                </div>
-                            </td>
+
 
                             <td class="th">
                                 <div class="form-label">合同签订时间：</div>
@@ -276,11 +262,6 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                                 </div>
                             </td>
 
-
-                        </tr>
-
-
-                        <tr>
                             <td class="th">
                                 <div class="form-label">入职时间：</div>
                             </td>
@@ -295,6 +276,13 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                             </td>
 
 
+                        </tr>
+
+
+                        <tr>
+
+
+
                             <td class="th">
                                 <div class="form-label">初始司龄（年）：</div>
                             </td>

zjugis-business/src/main/resources/templates/Staff/js/index.js

@@ -405,7 +405,7 @@
         z.ui.input("[name='createReqVO$hkszd']").setValue(staff.hkszd);
         z.ui.input("[name='createReqVO$xjzdz']").setValue(staff.xjzdz);
         // z.ui.select("[name='createReqVO$drzw']").setValue(staff.drzw + "");
-        z.ui.select("[name='createReqVO$sfytd']").setValue(staff.sfytd + "");
+        // z.ui.select("[name='createReqVO$sfytd']").setValue(staff.sfytd + "");
         z.ui.laydate("[name='createReqVO$cjgzsj']").setValue(moment(staff.cjgzsj).format('YYYY-MM-DD'));
         z.ui.laydate("[name='createReqVO$rgssj']").setValue(moment(staff.rgssj).format('YYYY-MM-DD'));
         z.ui.input("[name='createReqVO$cssl']").setValue(staff.cssl);

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.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -56,13 +57,6 @@ public class StaffRecordsDTO {
     @Schema(description = "离职时间")
     private LocalDateTime lzsj;
 
-
-    @Schema(description = "是否已调档")
-    private Integer sfytd;
-
-    @Schema(description = "社保缴纳处")
-    private String sbjnc;
-
     @Schema(description = "性别")
     private Integer sex;
 
@@ -75,35 +69,14 @@ public class StaffRecordsDTO {
     @Schema(description = "身份证号码")
     private String cardid;
 
-    @Schema(description = "身体状况")
-    private String stzk;
+
 
     @Schema(description = "户口所在地")
     private String hkszd;
 
-    @Schema(description = "户口邮政编码")
-    private String hkyzbm;
-
-    @Schema(description = "现居住地址")
-    private String xjzdz;
-
-    @Schema(description = "现邮政编码")
-    private String xyzbm;
-
     @Schema(description = "婚姻状况")
     private Integer hyzk;
 
-    @Schema(description = "英语等级")
-    private String yydj;
-
-    @Schema(description = "技能证书")
-    private String jnzs;
-
-    @Schema(description = "籍贯")
-    private String jg;
-
-    @Schema(description = "邮政编码")
-    private String yzbm;
 
     @Schema(description = "手机")
     private String mobilePhone;
@@ -123,8 +96,6 @@ public class StaffRecordsDTO {
     @Schema(description = "紧急联系人关系")
     private Integer jjlxrgx;
 
-    @Schema(description = "基本情况备注")
-    private String jbqkbz;
 
     @Schema(description = "所属部门")
     private String ssbm;
@@ -149,41 +120,6 @@ public class StaffRecordsDTO {
     private String nldj;
 
 
-    @Schema(description = "聘用形式")
-    private Integer pyxs;
-
-    @Schema(description = "如未调档档案所在地")
-    private String rwtddaszd;
-
-    @Schema(description = "入公司备注")
-    private String rgsbz;
-
-    @Schema(description = "兴趣爱好")
-    private String xqah;
-
-    @Schema(description = "技能特长")
-    private String jntc;
-
-    @Schema(description = "成果奖励")
-    private String cgjl;
-
-    @Schema(description = "自我评价")
-    private String zwpj;
-
-    @Schema(description = "个人简历文件ID")
-    private String grjlwjid;
-
-    @Schema(description = "身份证文件ID")
-    private String sfzwjid;
-
-    @Schema(description = "照片文件ID")
-    private String zpwjid;
-
-    @Schema(description = "合同文件ID")
-    private String htwjid;
-
-    @Schema(description = "学历证书复印件文件ID")
-    private String xlzsfyjwjid;
 
     @Schema(description = "员工姓名")
     private String nickname;

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/vo/records/RecordsBaseVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -48,12 +49,6 @@ public class RecordsBaseVO {
     private LocalDateTime lzsj;
 
 
-    @Schema(description = "是否已调档")
-    private Integer sfytd;
-
-    @Schema(description = "社保缴纳处")
-    private String sbjnc;
-
     @Schema(description = "性别")
     private Integer sex;
 
@@ -66,36 +61,13 @@ public class RecordsBaseVO {
     @Schema(description = "身份证号码")
     private String cardid;
 
-    @Schema(description = "身体状况")
-    private String stzk;
 
     @Schema(description = "户口所在地")
     private String hkszd;
 
-    @Schema(description = "户口邮政编码")
-    private String hkyzbm;
-
-    @Schema(description = "现居住地址")
-    private String xjzdz;
-
-    @Schema(description = "现邮政编码")
-    private String xyzbm;
-
     @Schema(description = "婚姻状况")
     private Integer hyzk;
 
-    @Schema(description = "英语等级")
-    private String yydj;
-
-    @Schema(description = "技能证书")
-    private String jnzs;
-
-    @Schema(description = "籍贯")
-    private String jg;
-
-    @Schema(description = "邮政编码")
-    private String yzbm;
-
     @Schema(description = "手机")
     private String mobilePhone;
 
@@ -136,43 +108,6 @@ public class RecordsBaseVO {
     @Schema(description = "能力等级")
     private String nldj;
 
-
-    @Schema(description = "聘用形式")
-    private Integer pyxs;
-
-    @Schema(description = "如未调档档案所在地")
-    private String rwtddaszd;
-
-    @Schema(description = "入公司备注")
-    private String rgsbz;
-
-    @Schema(description = "兴趣爱好")
-    private String xqah;
-
-    @Schema(description = "技能特长")
-    private String jntc;
-
-    @Schema(description = "成果奖励")
-    private String cgjl;
-
-    @Schema(description = "自我评价")
-    private String zwpj;
-
-    @Schema(description = "个人简历文件ID")
-    private String grjlwjid;
-
-    @Schema(description = "身份证文件ID")
-    private String sfzwjid;
-
-    @Schema(description = "照片文件ID")
-    private String zpwjid;
-
-    @Schema(description = "合同文件ID")
-    private String htwjid;
-
-    @Schema(description = "学历证书复印件文件ID")
-    private String xlzsfyjwjid;
-
     @Schema(description = "员工姓名")
     private String nickname;
 
@@ -222,4 +157,19 @@ public class RecordsBaseVO {
      * 试用期
      */
     private Integer syq;
+
+    /**
+     * 续签次数
+     */
+    private Integer xqcs;
+
+    /**
+     * 原始合同起始时间
+     */
+    private LocalDate yshtqssj;
+
+    /**
+     * 原始入职时间
+     */
+    private LocalDate ysrzsj;
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/controller/admin/staff/vo/records/RecordsPageReqVO.java

@@ -40,10 +40,4 @@ public class RecordsPageReqVO extends PageParam {
 
     @Schema(description = "专业")
     private String major;
-
-    @Schema(description = "聘用形式")
-    private Integer pyxs;
-
-    @Schema(description = "是否已调档")
-    private Integer sfytd;
 }

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/dal/dataobject/staff/StaffRecordSDO.java

@@ -8,6 +8,7 @@ import com.zjugis.framework.mybatis.core.dataobject.BaseDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -41,17 +42,13 @@ public class StaffRecordSDO extends BaseDO {
      * 3-正式
      * 4-离职
      */
-    private Integer state;
+    private String state;
 
-    /**
-     * 社保缴纳处
-     */
-    private String sbjnc;
 
     /**
      * 性别
      */
-    private Integer sex;
+    private String sex;
 
     /**
      * 民族
@@ -71,12 +68,8 @@ public class StaffRecordSDO extends BaseDO {
     /**
      * 政治面貌
      */
-    private Integer zzmm;
+    private String zzmm;
 
-    /**
-     * 身体状况
-     */
-    private String stzk;
 
     /**
      * 户口所在地
@@ -86,27 +79,19 @@ public class StaffRecordSDO extends BaseDO {
     /**
      * 户口性质
      */
-    private Integer hkxz;
+    private String hkxz;
 
-    /**
-     * 户口邮政编码
-     */
-    private String hkyzbm;
 
     /**
      * 现居住地址
      */
     private String xjzdz;
 
-    /**
-     * 现邮政编码
-     */
-    private String xyzbm;
 
     /**
      * 婚姻状况
      */
-    private Integer hyzk;
+    private String hyzk;
 
     /**
      * 毕业学校
@@ -121,17 +106,8 @@ public class StaffRecordSDO extends BaseDO {
     /**
      * 最高学历
      */
-    private Integer zgxl;
-
-    /**
-     * 英语等级
-     */
-    private String yydj;
+    private String zgxl;
 
-    /**
-     * 技能证书
-     */
-    private String jnzs;
 
     /**
      * 参加工作时间
@@ -143,16 +119,6 @@ public class StaffRecordSDO extends BaseDO {
      */
     private String major;
 
-    /**
-     * 籍贯
-     */
-    private String jg;
-
-    /**
-     * 邮政编码
-     */
-    private String yzbm;
-
     /**
      * 手机
      */
@@ -176,12 +142,7 @@ public class StaffRecordSDO extends BaseDO {
     /**
      * 紧急联系人关系
      */
-    private Integer jjlxrgx;
-
-    /**
-     * 基本情况备注
-     */
-    private String jbqkbz;
+    private String jjlxrgx;
 
     /**
      * 所属部门
@@ -223,70 +184,6 @@ public class StaffRecordSDO extends BaseDO {
      */
     private String nldj;
 
-    /**
-     * 是否已调档 1是 2否
-     */
-    private Integer sfytd;
-
-    /**
-     * 聘用形式
-     */
-    private Integer pyxs;
-
-    /**
-     * 如未调档档案所在地
-     */
-    private String rwtddaszd;
-
-    /**
-     * 入公司备注
-     */
-    private String rgsbz;
-
-    /**
-     * 兴趣爱好
-     */
-    private String xqah;
-
-    /**
-     * 技能特长
-     */
-    private String jntc;
-
-    /**
-     * 成果奖励
-     */
-    private String cgjl;
-
-    /**
-     * 自我评价
-     */
-    private String zwpj;
-
-    /**
-     * 个人简历文件ID
-     */
-    private String grjlwjid;
-
-    /**
-     * 身份证文件ID
-     */
-    private String sfzwjid;
-
-    /**
-     * 照片文件ID
-     */
-    private String zpwjid;
-
-    /**
-     * 合同文件ID
-     */
-    private String htwjid;
-
-    /**
-     * 学历证书复印件文件ID
-     */
-    private String xlzsfyjwjid;
 
     /**
      * 员工姓名
@@ -332,7 +229,6 @@ public class StaffRecordSDO extends BaseDO {
      */
     private String yhzh;
 
-    private String hz;
 
     /**
      * 初始司领
@@ -353,4 +249,19 @@ public class StaffRecordSDO extends BaseDO {
      * 试用期
      */
     private Integer syq;
+
+    /**
+     * 续签次数
+     */
+    private Integer xqcs;
+
+    /**
+     * 原始合同起始时间
+     */
+    private LocalDate yshtqssj;
+
+    /**
+     * 原始入职时间
+     */
+    private LocalDate ysrzsj;
 }

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

@@ -80,8 +80,6 @@ public class RecordsServiceImpl implements RecordsService {
                         .eqIfPresent(StaffRecordSDO::getZzmm, reqVO.getZzmm())
                         .eqIfPresent(StaffRecordSDO::getHkxz, reqVO.getHkxz())
                         .likeIfPresent(StaffRecordSDO::getMajor, reqVO.getMajor())
-                        .eqIfPresent(StaffRecordSDO::getPyxs, reqVO.getPyxs())
-                        .eqIfPresent(StaffRecordSDO::getSfytd, reqVO.getSfytd())
                         .eqIfPresent(StaffRecordSDO::getZgxl, reqVO.getZgxl())
                         .inIfPresent(StaffRecordSDO::getUserId, userIds)
                         .orderByDesc(StaffRecordSDO::getUpdateTime)
@@ -281,7 +279,7 @@ public class RecordsServiceImpl implements RecordsService {
         dto.setNickname(staffRecordSDO.getNickname());
         dto.setDeptId(staffRecordSDO.getDeptId());
         dto.setMobile(staffRecordSDO.getMobilePhone());
-        dto.setSex(staffRecordSDO.getSex());
+        dto.setSex(Integer.valueOf(staffRecordSDO.getSex()));
         if (StrUtil.isNotEmpty(staffRecordSDO.getUserId())) {
             dto.setUserId(staffRecordSDO.getUserId());
         }

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

@@ -92,13 +92,13 @@ public class StaffStatisticServiceImpl implements StaffStatisticService {
         Map<String, Long> degreeGroupCounts = staffList.stream().filter(employee -> employee.getZgxl() != null)
                 .collect(Collectors.groupingBy(
                         employee -> {
-                            if (employee.getZgxl() == 6) {
+                            if (employee.getZgxl().equals("6")) {
                                 return "doctorStaff";
-                            } else if (employee.getZgxl() == 5) {
+                            } else if (employee.getZgxl().equals("5")) {
                                 return "masterStaff";
-                            } else if (employee.getZgxl() == 4) {
+                            } else if (employee.getZgxl().equals("4")) {
                                 return "undergraduateStaff";
-                            } else if (employee.getZgxl() == 3) {
+                            } else if (employee.getZgxl().equals("3")) {
                                 return "juniorCollegeStaff";
                             } else {
                                 return "belowJuniorCollegeStaff";
@@ -141,9 +141,9 @@ public class StaffStatisticServiceImpl implements StaffStatisticService {
         Map<String, Long> degreeGroupCounts = staffList.stream().filter(employee -> employee.getSex() != null)
                 .collect(Collectors.groupingBy(
                         employee -> {
-                            if (employee.getSex() == 0) {
+                            if (employee.getSex().equals("0")) {
                                 return "girl";
-                            } else if (employee.getSex() == 1) {
+                            } else if (employee.getSex().equals("1")) {
                                 return "boy";
                             } else {
                                 return "unknown";
@@ -168,11 +168,11 @@ public class StaffStatisticServiceImpl implements StaffStatisticService {
         Map<String, Long> degreeGroupCounts = staffList.stream().filter(employee -> employee.getState() != null)
                 .collect(Collectors.groupingBy(
                         employee -> {
-                            if (employee.getState() == 1) {
+                            if (employee.getState().equals("1")) {
                                 return "traineeStaff";
-                            } else if (employee.getState() == 2) {
+                            } else if (employee.getState().equals("2")) {
                                 return "probationaryStaff";
-                            } else if (employee.getState() == 3) {
+                            } else if (employee.getState().equals("3")) {
                                 return "formalStaff";
                             } else {
                                 return "leave ";