Commit df5d53c1 authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent 61b8bdeb
...@@ -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 Date expectedCollectionTime; private DateTime expectedCollectionTime;
/** /**
* 签订类型-续签、新签等 * 签订类型-续签、新签等
*/ */
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.service.impl; package com.yifu.cloud.plus.v1.yifu.archives.service.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.ExcelWriter;
...@@ -508,7 +509,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon ...@@ -508,7 +509,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
} }
//reminderDate 设置15:20 //reminderDate 设置15:20
// 设置预计发起时间 // 设置预计发起时间
preVoTemp.setExpectedCollectionTime(DateUtil.stringToDate( preVoTemp.setExpectedCollectionTime(DateTime.of(
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));
} }
......
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