Commit e663bcb7 authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent 4d2d357d
...@@ -235,7 +235,7 @@ public class TEmployeeContractPreNew extends BaseEntity { ...@@ -235,7 +235,7 @@ public class TEmployeeContractPreNew extends BaseEntity {
@ExcelAttribute(name = "预计合同发起时间", isDate = true) @ExcelAttribute(name = "预计合同发起时间", isDate = true)
@ExcelProperty("预计合同发起时间") @ExcelProperty("预计合同发起时间")
@Schema(description = "预计合同发起时间") @Schema(description = "预计合同发起时间")
private DateTime expectedCollectionTime; private Date expectedCollectionTime;
/** /**
* 续签合同发起时间类型 0 上一份合同到期前一个月 最新更新为:0 上一份合同到期前第5个工作日 1 上一份合同到期后第10个工作日 * 续签合同发起时间类型 0 上一份合同到期前一个月 最新更新为:0 上一份合同到期前第5个工作日 1 上一份合同到期后第10个工作日
......
...@@ -235,7 +235,7 @@ public class TEmployeeContractPreNewVo extends TEmployeeContractPreNew implement ...@@ -235,7 +235,7 @@ public class TEmployeeContractPreNewVo extends TEmployeeContractPreNew implement
@ExcelAttribute(name = "预计合同发起时间", isDate = true) @ExcelAttribute(name = "预计合同发起时间", isDate = true)
@ExcelProperty("预计合同发起时间") @ExcelProperty("预计合同发起时间")
@Schema(description = "预计合同发起时间") @Schema(description = "预计合同发起时间")
private DateTime expectedCollectionTime; private Date expectedCollectionTime;
/** /**
* 签订类型-续签、新签等 * 签订类型-续签、新签等
*/ */
......
...@@ -509,7 +509,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -509,7 +509,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
} }
//reminderDate 设置15:20 //reminderDate 设置15:20
// 设置预计发起时间 // 设置预计发起时间
preVoTemp.setExpectedCollectionTime(DateTime.of( preVoTemp.setExpectedCollectionTime(DateUtil.stringToDate(
DateUtil.dateToString(DateUtil.getDateByLocalDate(reminderDate), DateUtil.dateToString(DateUtil.getDateByLocalDate(reminderDate),
DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 15:20", DateUtil.DATETIME_PATTERN_MINUTE)); DateUtil.ISO_EXPANDED_DATE_FORMAT) + " 15:20", DateUtil.DATETIME_PATTERN_MINUTE));
} }
...@@ -1285,7 +1285,6 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -1285,7 +1285,6 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeContractPreNew::getId, preNew.getId()) updateWrapper.eq(TEmployeeContractPreNew::getId, preNew.getId())
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.ELEVEN_STRING) // 11 撤销签署-系统自动撤销 .set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.ELEVEN_STRING) // 11 撤销签署-系统自动撤销
//.set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING) // 线下签
.set(TEmployeeContractPreNew::getRevokeReason, "超时未签署自行变更为线下签") .set(TEmployeeContractPreNew::getRevokeReason, "超时未签署自行变更为线下签")
.set(TEmployeeContractPreNew::getChangeTypeReason, "超时未签署自行变更为线下签") .set(TEmployeeContractPreNew::getChangeTypeReason, "超时未签署自行变更为线下签")
.set(TEmployeeContractPreNew::getChangeTypeUser, "超管") .set(TEmployeeContractPreNew::getChangeTypeUser, "超管")
......
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