Commit 7f53eb73 authored by huyuchen's avatar huyuchen

合同同步档案信息

parent 8b21e6ba
......@@ -13,6 +13,7 @@ import lombok.Data;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.time.LocalDate;
/**
* @Author fxj
......@@ -203,4 +204,10 @@ public class EmpProjectDispatchVo implements Serializable {
*/
@Schema(description ="是否更新岗位信息")
private Boolean postUpdate;
/**
* 入职日期
*/
@Schema(description ="入职日期")
private LocalDate enjoinDate;
}
......@@ -150,7 +150,7 @@
from
t_employee_project a
left join t_employee_info b on a.EMP_ID = b.id
where a.DELETE_FLAG = '0' and a.dept_no = #{deptNo}
where a.DELETE_FLAG = '0' and a.project_status = 0 and a.dept_no = #{deptNo}
</select>
<!--生成数据封装-->
......
......@@ -86,6 +86,7 @@ import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
......@@ -2119,6 +2120,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
project.setPost(excel.getPost());
project.setWorkingHours(excel.getWorkingHours());
project.setTryPeriod(excel.getTryPeriod());
project.setEnjoinDate(null != excel.getContractStart() ? excel.getContractStart().toInstant().atZone(ZoneId.systemDefault()).toLocalDate() : null);
if (Common.isNotNull(socialSet)){
project.setSocialProvince(socialSet.getProvince());
project.setSocialCity(socialSet.getCity());
......
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