Commit 2c03b025 authored by hongguangwu's avatar hongguangwu

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

parents 7ef82a56 53de339e
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.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import java.io.Serializable;
import java.util.Date;
......@@ -62,6 +54,10 @@ public class UpProjectSocialFundVo implements Serializable {
String detailId;
String contactAddress;
String highEducation;
/**
* 户口性质
*/
private String empRegisType;
/**
* 学校
*/
......
......@@ -1469,6 +1469,9 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (Common.isNotNull(vo.getGradutionDate())){
employee.setGradutionDate(vo.getGradutionDate());
}
if (Common.isNotNull(vo.getEmpRegisType())){
employee.setEmpRegisType(vo.getEmpRegisType());
}
tEmployeeInfoMapper.updateSocialInfoById(employee);
}
TEmployeeProject project = baseMapper.selectOne(Wrappers.<TEmployeeProject>query().lambda()
......
......@@ -1208,7 +1208,7 @@
<if test="tEmployeeInfo.fileTown != null">a.FILE_TOWN=#{tEmployeeInfo.fileTown},</if>
<if test="tEmployeeInfo.fileTown == null">a.FILE_TOWN=null,</if>
</if>
<if test="tEmployeeInfo.empRegisType != null">a.EMP_REGIS_TYPE=#{tEmployeeInfo.empRegisType},</if>
<if test="tEmployeeInfo.empPhone != null and tEmployeeInfo.empPhone != ''">a.EMP_PHONE=#{tEmployeeInfo.empPhone},</if>
</trim>
WHERE a.id=#{tEmployeeInfo.id}
......
......@@ -618,4 +618,12 @@ public interface ErrorCodes {
* 工作岗位不可为空
*/
String EMP_WORKING_JOB_NOT_EMPTY = "emp.work.job.not.empty";
/**
* 学历不可为空
*/
String EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY = "dispatch.emp.education.not.empty";
/**
* 户口性质不可为空
*/
String EMP_DISPATCH_EMP_REGISTYPE_NOT_EMPTY = "dispatch.emp.registype.not.empty";
}
......@@ -238,6 +238,10 @@ emp.work.record.end.date.not.empty=\u5DE5\u4F5C\u7ECF\u5386\u7ED3\u675F\u65E5\u6
emp.work.job.not.empty=\u5DE5\u4F5C\u5C97\u4F4D\u4E0D\u53EF\u4E3A\u7A7A
dispatch.emp.education.not.empty=\u5DF2\u6709\u6863\u6848\u5B66\u5386\u4E3A\u7A7A\uFF0C\u6D3E\u5355\u6A21\u677F\u5B66\u5386\u4E0D\u53EF\u4E3A\u7A7A\uFF0C\u8BF7\u8865\u5145\u5B66\u5386
dispatch.emp.registype.not.empty=\u5DF2\u6709\u6863\u6848\u6237\u53E3\u6027\u8D28\u4E3A\u7A7A\uFF0C\u6D3E\u5355\u6A21\u677F\u6237\u53E3\u6027\u8D28\u4E0D\u53EF\u4E3A\u7A7A\uFF0C\u8BF7\u8865\u5145\u6237\u53E3\u6027\u8D28
......
......@@ -813,11 +813,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
vo.setFileTown(excel.getFileTown());
vo.setMobile(excel.getEmpMobile());
vo.setEmpIdCard(socialFund.getEmpIdcard());
if (Common.isNotNull(excel.getEducationName())) {
DispatchEmpVo emp = null;
if (Common.isNotNull(empVoMap)) {
emp = empVoMap.get(excel.getEmpIdcard());
}
if (Common.isEmpty(emp.getEmpRegisType()) && Common.isNotNull(excel.getEmpRegisType())){
vo.setEmpRegisType(excel.getEmpRegisType());
}
if (Common.isNotNull(excel.getEducationName())) {
if(Common.isNotNull(emp)) {
if (Common.isEmpty(emp.getHignEducation())) {
vo.setHighEducation("");
......@@ -2349,6 +2352,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
签订期限:无固定期限 合同到期时间、合同期限非必填,合同开始时间必填;
签订期限:固定期限、已完成一定工作任务为期限 合同期限非必填,合同开始时间、合同到期时间都必填*/
if (Common.isNotNull(empVo)){
// fxj 2024-08-30 有档案 学历或户口性质为空 派单必填 学历或客户性质
if (Common.isEmpty(empVo.getHignEducation()) && Common.isEmpty(excel.getEducationName())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY)));
return true;
}
if (Common.isEmpty(empVo.getEmpRegisType()) && Common.isEmpty(excel.getEmpRegisType())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_REGISTYPE_NOT_EMPTY)));
return true;
}
if (Common.isNotNull(empVo.getProjectStatus()) && empVo.getProjectStatus().intValue() == CommonConstants.ONE_INT){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_PROJECT_NOT_USED)));
return true;
......
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