Commit 1ce7aa8a authored by fangxinjiang's avatar fangxinjiang

基础档案新增字段及必填调整

parent b091c900
...@@ -133,12 +133,4 @@ public class TEmpProfessionalQualification extends BaseEntity { ...@@ -133,12 +133,4 @@ public class TEmpProfessionalQualification extends BaseEntity {
**/ **/
@TableField(exist = false) @TableField(exist = false)
private String attaIds; private String attaIds;
/**
* 是否有职业资格证书:0 是 1 否
*/
@ExcelAttribute(name = "是否有职业资格证书",isNotEmpty = true,isDataId = true, readConverterExp = "0=是,1=否")
@Schema(description ="是否有职业资格证书:0 是 1 否")
private String haveQualification;
} }
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
...@@ -534,4 +536,12 @@ public class TEmployeeContractInfo extends BaseEntity { ...@@ -534,4 +536,12 @@ public class TEmployeeContractInfo extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private int limitEnd; private int limitEnd;
/**
* 试用期(单位月)
*/
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="试用期")
private String tryPeriod;
} }
...@@ -471,4 +471,15 @@ public class TEmployeeInfo extends BaseEntity { ...@@ -471,4 +471,15 @@ public class TEmployeeInfo extends BaseEntity {
@TableField(exist = false) @TableField(exist = false)
private LocalDateTime createTimeEnd; private LocalDateTime createTimeEnd;
/**
* 是否为首份工作 0是/1否
*/
@Schema(description ="是否为首份工作 0是/1否")
private String firstWorkFlag;
/**
* 是否有职业资格证书:0 是 1 否
*/
@ExcelAttribute(name = "是否有职业资格证书",isNotEmpty = true,isDataId = true, readConverterExp = "0=是,1=否")
@Schema(description ="是否有职业资格证书:0 是 1 否")
private String haveQualification;
} }
...@@ -105,11 +105,4 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable { ...@@ -105,11 +105,4 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
@ExcelProperty(value ="备注") @ExcelProperty(value ="备注")
private String remark; private String remark;
/**
* 是否有职业资格证书:0 是 1 否
*/
@ExcelAttribute(name = "是否有职业资格证书",isNotEmpty = true,isDataId = true, readConverterExp = "0=是,1=否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="获取方式")
private String haveQualification;
} }
...@@ -105,11 +105,6 @@ public class EmpWorkRecordExcelVO extends RowIndex implements Serializable { ...@@ -105,11 +105,6 @@ public class EmpWorkRecordExcelVO extends RowIndex implements Serializable {
@ExcelProperty(value ="结束工作日期") @ExcelProperty(value ="结束工作日期")
private Date endDate; private Date endDate;
/**
* 是否为首份工作 0是/1否
*/
@Schema(description ="是否为首份工作 0是/1否")
private String firstWorkFlag;
/*JSR303 是一套JavaBean参数校验的标准,它定义了很多常用的校验注解,我们可以直接将这些注解加在我们JavaBean的属性上面,就可以在需要校验的时候进行校验了。注解如下: /*JSR303 是一套JavaBean参数校验的标准,它定义了很多常用的校验注解,我们可以直接将这些注解加在我们JavaBean的属性上面,就可以在需要校验的时候进行校验了。注解如下:
参考配置 参考配置
......
...@@ -291,4 +291,12 @@ public class EmployeeContractExportVO implements Serializable { ...@@ -291,4 +291,12 @@ public class EmployeeContractExportVO implements Serializable {
@Schema(description = "备注") @Schema(description = "备注")
@ExcelProperty("备注") @ExcelProperty("备注")
private String memo; private String memo;
/**
* 试用期(单位月)
*/
@ExcelAttribute(name = "试用期")
@Schema(description = "试用期", name = "tryPeriod")
@ExcelProperty("试用期")
private String tryPeriod;
} }
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex; import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
...@@ -193,4 +195,12 @@ public class EmployeeContractVO extends RowIndex implements Serializable { ...@@ -193,4 +195,12 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1,readConverterExp = "0=是,1=否") @ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1,readConverterExp = "0=是,1=否")
@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee") @Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
private String changeContractAndEmployee; private String changeContractAndEmployee;
/**
* 试用期(单位月)
*/
@ExcelAttribute(name = "试用期", maxLength = 4)
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="试用期")
private String tryPeriod;
} }
...@@ -23,6 +23,7 @@ import com.alibaba.excel.annotation.write.style.HeadFontStyle; ...@@ -23,6 +23,7 @@ import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -267,5 +268,19 @@ public class EmployeeExportVO extends BaseEntity { ...@@ -267,5 +268,19 @@ public class EmployeeExportVO extends BaseEntity {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "人员档案状态") @ExcelProperty(value = "人员档案状态")
private String status; private String status;
/**
* 是否为首份工作 0是/1否
*/
@ExcelAttribute(name = "是否为首份工作", readConverterExp = "0=是,1=否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "是否为首份工作")
private String firstWorkFlag;
/**
* 是否有职业资格证书:0 是 1 否
*/
@ExcelAttribute(name = "是否有职业资格证书",isNotEmpty = true,isDataId = true, readConverterExp = "0=是,1=否")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "是否有职业资格证书")
private String haveQualification;
} }
...@@ -123,7 +123,7 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM ...@@ -123,7 +123,7 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
@Override @Override
public R<Boolean> saveDiy(TEmpWorkRecording recording) { public R<Boolean> saveDiy(TEmpWorkRecording recording) {
if (CommonConstants.ONE_STRING.equals(recording.getFirstWorkFlag()) && Common.isEmpty(recording.getEndDate())){ if (Common.isEmpty(recording.getEndDate())){
return R.failed("结束日期必填"); return R.failed("结束日期必填");
} }
recording.setDeleteFlag(CommonConstants.ZERO_STRING); recording.setDeleteFlag(CommonConstants.ZERO_STRING);
......
...@@ -44,6 +44,5 @@ ...@@ -44,6 +44,5 @@
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="remark" column="REMARK"/> <result property="remark" column="REMARK"/>
<result property="haveQualification" column="HAVE_QUALIFICATION"/>
</resultMap> </resultMap>
</mapper> </mapper>
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
<result property="createTime" column="CREATE_TIME"/> <result property="createTime" column="CREATE_TIME"/>
<result property="updateTime" column="UPDATE_TIME"/> <result property="updateTime" column="UPDATE_TIME"/>
<result property="remark" column="REMARK"/> <result property="remark" column="REMARK"/>
<result property="firstWorkFlag" column="FIRST_WORK_FLAG"/>
</resultMap> </resultMap>
</mapper> </mapper>
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
<result property="leaveDate" column="LEAVE_DATE"/> <result property="leaveDate" column="LEAVE_DATE"/>
<result property="reduceReason" column="REDUCE_REASON"/> <result property="reduceReason" column="REDUCE_REASON"/>
<result property="changeContractAndEmployee" column="CHANGE_CONTRACT_AND_EMPLOYEE"/> <result property="changeContractAndEmployee" column="CHANGE_CONTRACT_AND_EMPLOYEE"/>
<result property="tryPeriod" column="TRY_PERIOD"/>
</resultMap> </resultMap>
<!-- 合同审核导出 --> <!-- 合同审核导出 -->
...@@ -205,7 +206,8 @@ ...@@ -205,7 +206,8 @@
a.LEAVE_DATE, a.LEAVE_DATE,
a.AUDIT_USER_NAME, a.AUDIT_USER_NAME,
a.REDUCE_REASON, a.REDUCE_REASON,
a.type a.type,
a.TRY_PERIOD
</sql> </sql>
......
...@@ -74,6 +74,9 @@ ...@@ -74,6 +74,9 @@
<result property="leaveReason" column="LEAVE_REASON"/> <result property="leaveReason" column="LEAVE_REASON"/>
<result property="leaveRemark" column="LEAVE_REMARK"/> <result property="leaveRemark" column="LEAVE_REMARK"/>
<result property="contactAddress" column="CONTACT_ADDRESS"/> <result property="contactAddress" column="CONTACT_ADDRESS"/>
<result property="firstWorkFlag" column="FIRST_WORK_FLAG"/>
<result property="haveQualification" column="HAVE_QUALIFICATION"/>
</resultMap> </resultMap>
<resultMap id="tEmployeeExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeExportVO"> <resultMap id="tEmployeeExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeExportVO">
...@@ -125,6 +128,8 @@ ...@@ -125,6 +128,8 @@
<result property="leaveReason" column="LEAVE_REASON"/> <result property="leaveReason" column="LEAVE_REASON"/>
<result property="leaveRemark" column="LEAVE_REMARK"/> <result property="leaveRemark" column="LEAVE_REMARK"/>
<result property="status" column="STATUS"/> <result property="status" column="STATUS"/>
<result property="firstWorkFlag" column="FIRST_WORK_FLAG"/>
<result property="haveQualification" column="HAVE_QUALIFICATION"/>
</resultMap> </resultMap>
<resultMap id="tEmployeeLeaveExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeLeaveExportVO"> <resultMap id="tEmployeeLeaveExportMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeLeaveExportVO">
...@@ -180,10 +185,7 @@ ...@@ -180,10 +185,7 @@
</resultMap> </resultMap>
<sql id="baseParam"> <sql id="baseParam">
a a.ID,
.
ID
,
a.EMP_CODE, a.EMP_CODE,
a.EMP_NATRUE, a.EMP_NATRUE,
a.EMP_NAME, a.EMP_NAME,
...@@ -232,7 +234,9 @@ ...@@ -232,7 +234,9 @@
a.LEAVE_TIME, a.LEAVE_TIME,
a.LEAVE_REASON, a.LEAVE_REASON,
a.LEAVE_REMARK, a.LEAVE_REMARK,
a.CONTACT_ADDRESS a.CONTACT_ADDRESS,
a.FIRST_WORK_FLAG,
a.HAVE_QUALIFICATION
</sql> </sql>
<sql id="Base_Export_List"> <sql id="Base_Export_List">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment