Commit cdbcbc22 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 5a872f32
......@@ -132,10 +132,19 @@ public class TEmployeeContractPre extends BaseEntity {
private String contractDurationMonth;
@Schema(description = "合同试用期开始时间")
private Date periodStart;
private Date tryPeriodStart;
@Schema(description = "合同试用期结束时间")
private Date periodEnd;
private Date tryPeriodEnd;
@Schema(description = "工作任务")
private String task;
@Schema(description = "任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同")
private String taskType;
@Schema(description = "结束任务标准")
private String taskEndStandard;
@Schema(description = "配置名称")
private String configName;
......@@ -194,7 +203,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema(description = "工资发放时间")
private String paymentTime;
@Schema(description = "工资发放方式 0 直接发放/委托银行代发")
@Schema(description = "工资发放方式 0 直接发放/1委托银行代发")
private String paymentType;
@Schema(description = "派遣期限-年")
......
......@@ -239,26 +239,50 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
@ExcelAttribute(name = "合同年限-年")
@Schema(description = "合同年限-年")
@ExcelProperty("合同年限-年")
private String contractDuratioYear;
private String contractDurationYear;
@ExcelAttribute(name = "合同年限-月")
@Schema(description = "合同年限-月")
@ExcelProperty("合同年限-月")
private String contractDuratioMonth;
private String contractDurationMonth;
/**
* 合同试用期开始时间
*/
@ExcelAttribute(name = "合同试用期开始时间", isDate = true)
@Schema(description = "合同试用期开始时间")
@ExcelProperty("合同试用期开始时间")
private Date periodStart;
private Date tryPeriodStart;
/**
* 合同试用期结束时间
*/
@ExcelAttribute(name = "合同试用期结束时间", isDate = true)
@Schema(description = "合同试用期结束时间")
@ExcelProperty("合同试用期结束时间")
private Date periodEnd;
private Date tryPeriodEnd;
/**
* 工作任务
*/
@ExcelAttribute(name = "工作任务", maxLength = 200)
@Length(max = 200, message = "工作任务不能超过200个字符")
@ExcelProperty("工作任务")
@Schema(description = "工作任务")
private String task;
/**
* 任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同
*/
@ExcelAttribute(name = "任务类型", maxLength = 2)
@Length(max = 1, message = "任务类型不能超过2个字符")
@ExcelProperty("任务类型")
@Schema(description = "任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同")
private String taskType;
/**
* 结束任务标准
*/
@ExcelAttribute(name = "结束任务标准", maxLength = 200)
@Length(max = 200, message = "结束任务标准不能超过200个字符")
@ExcelProperty("结束任务标准")
@Schema(description = "结束任务标准")
private String taskEndStandard;
/**
* 预计确认时间
*/
......
......@@ -359,9 +359,9 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
}
//获取短信待发放和信息待填写的数据
List<String> errorList = new ArrayList<>();
List<RegistParamVo> params = new ArrayList<>();
List<String> phones = new ArrayList<>();
for (TGzOfferInfoVo sendVo : offerList) {
List<RegistParamVo> params = new ArrayList<>();
List<String> phones = new ArrayList<>();
RegistParamVo paramVo = new RegistParamVo();
AliSmsResult res;
paramVo.setName(sendVo.getName());
......@@ -419,9 +419,9 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
}
//获取短信信息待收集、候选人填写信息的数据
List<String> errorList = new ArrayList<>();
List<RegistParamVo> params = new ArrayList<>();
List<String> phones = new ArrayList<>();
for (TGzOfferInfoVo sendVo : offerList) {
List<RegistParamVo> params = new ArrayList<>();
List<String> phones = new ArrayList<>();
RegistParamVo paramVo = new RegistParamVo();
AliSmsResult res;
paramVo.setName(sendVo.getName());
......@@ -470,7 +470,7 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
@Override
public R<String> sendContractDownloadOfferMsg(TGzOfferInfoVo tGzOfferInfo) {
//获取所有满足条件的信息待收集、候选人填写信息的offer提醒的数据
//获取所有满足条件的已归档的offer提醒的数据
if (Common.isNotNull(tGzOfferInfo)) {
tGzOfferInfo.setOfferStatus("99");
List<TGzOfferInfoVo> offerList = baseMapper.getTGzOfferInfoSendAlertList(tGzOfferInfo);
......@@ -478,11 +478,11 @@ public class TGzOfferInfoServiceImpl extends ServiceImpl<TGzOfferInfoMapper, TGz
if (Common.isNotNull(offerList) && offerList.size() >200) {
return R.failed("短信批量发送单次最多两百条");
}
//获取短信信息待收集、候选人填写信息的数据
//获取已归档的数据
List<String> errorList = new ArrayList<>();
List<RegistParamVo> params = new ArrayList<>();
List<String> phones = new ArrayList<>();
for (TGzOfferInfoVo sendVo : offerList) {
List<RegistParamVo> params = new ArrayList<>();
List<String> phones = new ArrayList<>();
RegistParamVo paramVo = new RegistParamVo();
AliSmsResult res;
paramVo.setName(sendVo.getName());
......
......@@ -34,8 +34,11 @@
<result property="contractDurationYear" column="contract_duration_year"/>
<result property="contractDurationMonth" column="contract_duration_month"/>
<result property="contractTerm" column="CONTRACT_TERM"/>
<result property="periodStart" column="period_start"/>
<result property="periodEnd" column="period_end"/>
<result property="tryPeriodStart" column="try_period_start"/>
<result property="tryPeriodEnd" column="try_period_end"/>
<result property="task" column="TASK"/>
<result property="taskType" column="TASK_TYPE"/>
<result property="taskEndStandard" column="TASK_END_STANDARD"/>
<result property="expectedConfirmTime" column="expected_confirm_time"/>
<result property="configName" column="config_name"/>
<result property="updateFlag" column="update_flag"/>
......@@ -109,8 +112,8 @@
,contract_start
,contract_end
,situation
,period_start
,period_end
,try_period_start
,try_period_end
,config_name
,update_flag
,try_period_type
......@@ -163,6 +166,9 @@
,create_name
,create_time
,update_by
,TASK
,TASK_TYPE
,TASK_END_STANDARD
</sql>
<sql id="tEmployeeContractPre_where">
<if test="tEmployeeContractPre != null">
......
......@@ -728,8 +728,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//合同开始日期、合同截止日期
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractEnd())
&& Common.isEmpty(employeeContractPreVo.getContractDuratioYear())
&& Common.isEmpty(employeeContractPreVo.getContractDuratioMonth())
&& Common.isEmpty(employeeContractPreVo.getContractDurationYear())
&& Common.isEmpty(employeeContractPreVo.getContractDurationMonth())
&& Common.isNotNull(employeeContractPreVo.getContractEndType())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate());
EkpDeptContractInfoVo infoVo = new EkpDeptContractInfoVo();
......@@ -746,28 +746,28 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractEnd())
&& Common.isNotNull(employeeContractPreVo.getContractDuratioYear())
&& Common.isNotNull(employeeContractPreVo.getContractDuratioMonth())) {
&& Common.isNotNull(employeeContractPreVo.getContractDurationYear())
&& Common.isNotNull(employeeContractPreVo.getContractDurationMonth())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getContractDuratioMonth()));
vo.setYearAfter(Integer.parseInt(employeeContractPreVo.getContractDuratioYear()));
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getContractDurationMonth()));
vo.setYearAfter(Integer.parseInt(employeeContractPreVo.getContractDurationYear()));
vo.setRegistDate(employeeContractPreVo.getContractStart());
employeeContractPreVo.setContractEnd(this.addYearsMonths(vo));
}
//合同开始日期
if (Common.isEmpty(employeeContractPreVo.getContractStart())
&& Common.isEmpty(employeeContractPreVo.getContractDuratioYear())
&& Common.isEmpty(employeeContractPreVo.getContractDuratioMonth())) {
&& Common.isEmpty(employeeContractPreVo.getContractDurationYear())
&& Common.isEmpty(employeeContractPreVo.getContractDurationMonth())) {
employeeContractPreVo.setContractStart(employeeContractPreVo.getJoinLeaveDate());
}
//试用期开始日期、试用期截止日期
if (Common.isEmpty(employeeContractPreVo.getPeriodStart())
if (Common.isEmpty(employeeContractPreVo.getTryPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getTryPeriodNum())) {
employeeContractPreVo.setPeriodStart(employeeContractPreVo.getJoinLeaveDate());
employeeContractPreVo.setTryPeriodStart(employeeContractPreVo.getJoinLeaveDate());
vo.setMonthAfter(Integer.parseInt(employeeContractPreVo.getTryPeriodNum()));
vo.setYearAfter(0);
vo.setRegistDate(employeeContractPreVo.getPeriodStart());
employeeContractPreVo.setPeriodEnd(this.addYearsMonths(vo));
vo.setRegistDate(employeeContractPreVo.getTryPeriodStart());
employeeContractPreVo.setTryPeriodEnd(this.addYearsMonths(vo));
}
//派遣开始日期、派遣结束日期
if (Common.isEmpty(employeeContractPreVo.getDispatchPeriodStart())
......@@ -780,6 +780,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
employeeContractPreVo.setDispatchPeriodEnd(this.addYearsMonths(vo));
}
//实习开始日期、实习结束日期
//实习开始日期、实习结束日期
if (Common.isEmpty(employeeContractPreVo.getInternshipPeriodStart())
&& Common.isNotNull(employeeContractPreVo.getInternshipPeriodNum())) {
employeeContractPreVo.setInternshipPeriodStart(employeeContractPreVo.getJoinLeaveDate());
......
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