Commit 9e293a47 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.22' into MVP1.7.22

parents 427a7d86 3cc84e1f
......@@ -569,4 +569,11 @@ public class TAutoContractScheme extends BaseEntity {
@Schema(description = "其他工作时间 (工作方式为第二种方式)")
private String otherWorkDay;
// MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符")
@ExcelProperty("发薪日")
@Schema(description = "发薪日")
private String salaryDay;
}
package com.yifu.cloud.plus.v1.yifu.archives.entity;
import cn.hutool.core.date.DateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
......@@ -8,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import java.time.LocalDateTime;
import java.util.Date;
......@@ -352,6 +354,11 @@ public class TEmployeeContractPre extends BaseEntity {
@ExcelAttribute(name = "邮箱")
private String empEmail;
// 1.7.22版本
@TableField(exist = false)
@ExcelProperty("微信号")
private String weChatId;
// 紧急联系人表
@TableField(exist = false)
@ExcelAttribute(name = "紧急联系人")
......@@ -364,6 +371,7 @@ public class TEmployeeContractPre extends BaseEntity {
@TableField(exist = false)
@ExcelAttribute(name = "紧急联系人地址")
private String contactAddress;
// 电子签推送需要的新字段——END
/**
* 是否拒绝入职: 0 是 1 否
......@@ -377,4 +385,11 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "是否已确认离职: 0 是 1 ")
private String isLeave;
// MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符")
@ExcelProperty("发薪日")
@Schema(description = "发薪日")
private String salaryDay;
}
......@@ -735,4 +735,16 @@ public class TEmployeeContractPreNew extends BaseEntity {
@ExcelAttribute(name = "邮箱")
private String empEmail;
// 1.7.22版本(档案字段)
@TableField(exist = false)
@ExcelProperty("微信号")
private String weChatId;
// MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符")
@ExcelProperty("发薪日")
@Schema(description = "发薪日")
private String salaryDay;
}
......@@ -571,6 +571,13 @@ public class TEmployeeInfo extends BaseEntity {
@Schema(description ="是否有职业资格证书:0 是 1 否")
private String haveQualification;
// 1.7.22版本新增字段
@ExcelAttribute(name = "微信号", maxLength = 50)
@Length(max = 50, message = "微信号不能超过50个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("微信号")
private String weChatId;
/**
* 其他附件--C段二维码扫码数据
*/
......
......@@ -518,4 +518,11 @@ public class TPreEmployeeInfo extends BaseEntity {
@Schema(description ="是否有职业资格证书:0 是 1 否")
private String haveQualification;
// 1.7.22版本新增字段
@ExcelAttribute(name = "微信号", maxLength = 50)
@Length(max = 50, message = "微信号不能超过50个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("微信号")
private String weChatId;
}
......@@ -8,6 +8,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.Size;
import java.io.Serializable;
......@@ -245,6 +246,13 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
@ExcelProperty(value = "通信地址-详细地址")
private String contactAddress;
// 1.7.22版本新增字段
@ExcelAttribute(name = "微信号", maxLength = 50)
@Length(max = 50, message = "微信号不能超过50个字符")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("微信号")
private String weChatId;
/*
// 紧急联系人姓名 与本人关系 联系地址-省 联系地址-市 联系地址-区/县 联系地址-详细地址 手机号码(紧急联系人)
@ExcelAttribute(name = "紧急联系人姓名", isNotEmpty = true, errorInfo = "紧急联系人姓名不能为空", maxLength = 20)
......
......@@ -56,6 +56,9 @@ public class PreUploadEmpImportVo implements Serializable {
private String empPhone;
@ExcelAttribute(name = "邮箱", maxLength = 50)
private String empEmail;
// 1.7.22版本新增字段
@ExcelAttribute(name = "微信号", maxLength = 50)
private String weChatId;
// 区域ID
@ExcelAttribute(name = "户籍所在地-省", isArea = true)
private String idProvince;
......
package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import lombok.Data;
......@@ -35,5 +36,8 @@ public class TEmployeeContractPrePushFascVo {
@ExcelAttribute(name = "手机号码")
private String empPhone;
@ExcelProperty("微信号")
private String weChatId;
}
......@@ -574,4 +574,11 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelProperty("法大大模版ID")
private String fadadaTemplateId;
// MVP1.7.22版本新字段:
@ExcelAttribute(name = "发薪日", maxLength = 2)
@Length(max = 2, message = "发薪日不能超过2个字符")
@ExcelProperty("发薪日")
@Schema(description = "发薪日")
private String salaryDay;
}
......@@ -9,6 +9,7 @@ public class EmployeeConstants {
public static final String REMARL_LENGTH = "备注长度超过200";
public static final String POST_LENGTH = "就职岗位长度超过20";
public static final String DEPT_NO_LENGTH = "项目编码长度超过20";
public static final String WE_CHAT_ID_NO_LENGTH = "微信号长度超过50";
public static final String VALIDITY_START = "身份证开始日期必填";
public static final String VALIDITY_END = "身份证截止日期必填";
public static final String VALIDITY_END_FORMAT = "身份证截止日期只能为日期格式:yyyy-MM-dd或者固定值:长期";
......
......@@ -343,6 +343,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
contract.setContactArea(empInfo.getContactArea());
contract.setEmpEmail(empInfo.getEmpEmail());
contract.setEmpPhone(empInfo.getEmpPhone());
contract.setWeChatId(empInfo.getWeChatId());
}
if (Common.isEmpty(contract.getFadadaTemplateId())) {
......@@ -407,6 +408,7 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
contract.setContactArea(empInfo.getContactArea());
contract.setEmpEmail(empInfo.getEmpEmail());
contract.setEmpPhone(empInfo.getEmpPhone());
contract.setWeChatId(empInfo.getWeChatId());
}
if (Common.isEmpty(contract.getFadadaTemplateId())) {
......
......@@ -1711,6 +1711,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp.setDeptNo(excel.getDeptNo());
}
}
if (Common.isNotNull(excel.getWeChatId())) {
if (excel.getWeChatId().length() > 50) {
errorMsg.add(EmployeeConstants.WE_CHAT_ID_NO_LENGTH);
} else {
saveEmp.setWeChatId(excel.getWeChatId());
}
}
this.setBaseData(saveEmp, CommonConstants.dingleDigitStrArray[5], user);
saveList.add(saveEmp);
}
......@@ -2277,6 +2284,13 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp.setDeptNo(excel.getDeptNo());
}
}
if (Common.isNotNull(excel.getWeChatId())) {
if (excel.getWeChatId().length() > 50) {
errorMsg.add(EmployeeConstants.WE_CHAT_ID_NO_LENGTH);
} else {
saveEmp.setWeChatId(excel.getWeChatId());
}
}
// 判断空值
//this.judgeNull(errorMsg, saveEmp);
......
......@@ -278,6 +278,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
newEmp.setCreateBy(user.getId());
newEmp.setCreateName(user.getNickname());
newEmp.setCreateTime(LocalDateTime.now());
newEmp.setWeChatId(emp.getWeChatId());
tPreEmployeeInfoService.save(newEmp);
vo.setTpreEmployeeInfo(newEmp);
// 全部保留
......@@ -3554,7 +3555,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return R.failed(voR == null ? "预入职导入识别表格异常!" : voR.getMsg());
}
String[] modelTitle = {"员工类型", "员工姓名", "身份证号", "身份证开始日期", "身份证截止日期", "婚姻状况", "民族"
, "政治面貌", "手机号码", "邮箱", "户籍所在地-省", "户籍所在地-市", "户籍所在地-区/县", "户口性质", "档案所在地-省"
, "政治面貌", "手机号码", "邮箱", "微信号", "户籍所在地-省", "户籍所在地-市", "户籍所在地-区/县", "户口性质", "档案所在地-省"
, "档案所在地-市", "档案所在地-区/县", "通信地址-省", "通信地址-市", "通信地址-区/县", "通信地址-详细地址"
, "紧急联系人姓名", "紧急联系人与本人关系", "联系地址-省", "联系地址-市", "联系地址-区/县", "联系地址-详细地址"
, "手机号码(紧急联系人)", "学历", "学校", "专业", "教育开始时间", "教育结束时间", "是否为首份工作", "工作单位"
......@@ -4136,6 +4137,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeInfo.setEmpNational(info.getEmpNationalValue());
tPreEmployeeInfo.setPoliticalStatus(info.getPoliticalStatusValue());
tPreEmployeeInfo.setEmpEmail(info.getEmpEmail());
tPreEmployeeInfo.setWeChatId(info.getWeChatId());
tPreEmployeeInfo.setEmpPhone(info.getEmpPhone());
// 2024-10-30 20:02:53 测试jld认为如果没写户籍省,则带出档案。我认为有道理
if (Common.isNotNull(info.getIdProvinceValue())) {
......
......@@ -80,6 +80,7 @@
<result property="workDay" column="WORK_DAY"/>
<result property="workHours" column="WORK_HOURS"/>
<result property="otherWorkDay" column="OTHER_WORK_DAY"/>
<result property="salaryDay" column="SALARY_DAY"/>
</resultMap>
<sql id="Base_Column_List">
a.ID,
......@@ -137,7 +138,8 @@
a.WORK_DAY_COUNT,
a.WORK_DAY,
a.WORK_HOURS,
a.OTHER_WORK_DAY
a.OTHER_WORK_DAY,
a.SALARY_DAY
</sql>
<sql id="tAutoContractScheme_where">
<if test="tAutoContractScheme != null">
......@@ -300,6 +302,9 @@
<if test="tAutoContractScheme.workHours != null and tAutoContractScheme.workHours.trim() != ''">
AND a.WORK_HOURS = #{tAutoContractScheme.workHours}
</if>
<if test="tAutoContractScheme.salaryDay != null and tAutoContractScheme.salaryDay.trim() != ''">
AND a.SALARY_DAY = #{tAutoContractScheme.salaryDay}
</if>
</if>
</sql>
<!--tAutoContractScheme简单分页查询-->
......
......@@ -137,7 +137,7 @@
,ifnull(st2.AREA_NAME,'')
,ifnull(a.CONTACT_ADDRESS,'')
) contactArea,a.EMP_EMAIL empEmail,
a.EMP_PHONE empPhone
a.EMP_PHONE empPhone,a.WE_CHAT_ID weChatId
from t_employee_info a
left join sys_area sp on sp.id = a.ID_PROVINCE
left join sys_area sc on sc.id = a.ID_CITY
......
......@@ -93,5 +93,6 @@
<result property="changeTypeUser" column="change_type_user"/>
<result property="changeTypeTime" column="change_type_time"/>
<result property="archivesIsCreate" column="archives_is_create"/>
<result property="salaryDay" column="SALARY_DAY"/>
</resultMap>
</mapper>
......@@ -93,6 +93,7 @@
<result property="changeTypeUser" column="change_type_user"/>
<result property="changeTypeTime" column="change_type_time"/>
<result property="archivesIsCreate" column="archives_is_create"/>
<result property="salaryDay" column="SALARY_DAY"/>
</resultMap>
<sql id="Base_Column_List">
a.id
......@@ -175,7 +176,7 @@
,a.TASK_TYPE
,a.TASK_END_STANDARD,a.contract_flag,a.CONTRACT_SUB_NAME
,a.request_id
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time
,a.request_msg,a.over_flag,a.change_type_reason,a.change_type_user,a.change_type_time,a.SALARY_DAY
</sql>
<sql id="tEmployeeContractPre_where">
<if test="tEmployeeContractPre != null">
......@@ -262,6 +263,9 @@
<if test="tEmployeeContractPre.revokeReason != null and tEmployeeContractPre.revokeReason.trim() != ''">
AND a.revoke_reason = #{tEmployeeContractPre.revokeReason}
</if>
<if test="tEmployeeContractPre.salaryDay != null and tEmployeeContractPre.salaryDay.trim() != ''">
AND a.SALARY_DAY = #{tEmployeeContractPre.salaryDay}
</if>
<if test="tEmployeeContractPre.expectedConfirmTime != null">
AND DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") =
DATE_FORMAT(#{tEmployeeContractPre.expectedConfirmTime},"%Y-%m-%d")
......
......@@ -110,6 +110,7 @@
<result property="createName" column="create_name"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="salaryDay" column="SALARY_DAY"/>
</resultMap>
<sql id="Base_Column_List">
a.id,
......@@ -196,7 +197,8 @@
a.create_by,
a.create_name,
a.create_time,
a.update_by
a.update_by,
a.SALARY_DAY
</sql>
<sql id="tEmpContractAlert_where">
<if test="tEmpContractAlert != null">
......@@ -638,6 +640,9 @@
<if test="tEmployeeContractPreNew.updateBy != null and tEmployeeContractPreNew.updateBy.trim() != ''">
AND a.update_by = #{tEmployeeContractPreNew.updateBy}
</if>
<if test="tEmployeeContractPreNew.salaryDay != null and tEmployeeContractPreNew.salaryDay.trim() != ''">
AND a.SALARY_DAY = #{tEmployeeContractPreNew.salaryDay}
</if>
</if>
</sql>
<!--tEmployeeContractPreNew简单分页查询-->
......
......@@ -88,6 +88,7 @@
<result property="contactProvince" column="CONTACT_PROVINCE"/>
<result property="contactCity" column="CONTACT_CITY"/>
<result property="contactTown" column="CONTACT_TOWN"/>
<result property="weChatId" column="WE_CHAT_ID"/>
</resultMap>
......@@ -264,7 +265,8 @@
a.TAX_MONTH,
a.CONTACT_PROVINCE,
a.CONTACT_CITY,
a.CONTACT_TOWN
a.CONTACT_TOWN,
a.WE_CHAT_ID
</sql>
<sql id="Base_Export_List">
......
......@@ -90,6 +90,7 @@
<result property="contactCity" column="CONTACT_CITY"/>
<result property="contactTown" column="CONTACT_TOWN"/>
<result property="taxMonthFlag" column="TAX_MONTH_FLAG"/>
<result property="weChatId" column="WE_CHAT_ID"/>
</resultMap>
<sql id="Base_Column_List">
......@@ -158,7 +159,8 @@
a.CONTACT_PROVINCE,
a.CONTACT_CITY,
a.CONTACT_TOWN,
a.TAX_MONTH_FLAG
a.TAX_MONTH_FLAG,
a.WE_CHAT_ID
</sql>
<sql id="tPreEmployeeInfo_where">
<if test="tPreEmployeeInfo != null">
......
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