Commit 94a68c49 authored by huyuchen's avatar huyuchen

优化修改

parent b481112f
...@@ -4,12 +4,10 @@ import cn.hutool.core.bean.BeanUtil; ...@@ -4,12 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import lombok.ToString; import lombok.ToString;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -113,8 +111,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn ...@@ -113,8 +111,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn
/** /**
* B端维护的入职时间 * B端维护的入职时间
*/ */
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss") private LocalDate businessEnjoinDate;
private LocalDateTime businessEnjoinDate;
/** /**
* B端维护的离职原因 * B端维护的离职原因
......
...@@ -55,7 +55,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties; ...@@ -55,7 +55,6 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties; import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprUpmsProperties;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -1671,7 +1670,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1671,7 +1670,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
businessVo.setDepartCode(tBusinessEmployeeExtendInfo.getDepartCode()); businessVo.setDepartCode(tBusinessEmployeeExtendInfo.getDepartCode());
businessVo.setExtendId(tBusinessEmployeeExtendInfo.getId()); businessVo.setExtendId(tBusinessEmployeeExtendInfo.getId());
if (null != tBusinessEmployeeExtendInfo.getBusinessEnjoinDate()) { if (null != tBusinessEmployeeExtendInfo.getBusinessEnjoinDate()) {
businessVo.setBusinessEnjoinDate(tBusinessEmployeeExtendInfo.getBusinessEnjoinDate().toLocalDate()); businessVo.setBusinessEnjoinDate(tBusinessEmployeeExtendInfo.getBusinessEnjoinDate());
} }
if(StringUtils.isNotBlank(tBusinessEmployeeExtendInfo.getBusinessPost())) { if(StringUtils.isNotBlank(tBusinessEmployeeExtendInfo.getBusinessPost())) {
businessVo.setBusinessPost(tBusinessEmployeeExtendInfo.getBusinessPost()); businessVo.setBusinessPost(tBusinessEmployeeExtendInfo.getBusinessPost());
......
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