Commit a71889e7 authored by huyuchen's avatar huyuchen

导出优化

parent f0412bfb
...@@ -8,6 +8,7 @@ import lombok.Data; ...@@ -8,6 +8,7 @@ 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;
...@@ -111,7 +112,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn ...@@ -111,7 +112,7 @@ public class TBusinessEmployeeExtendInfo extends Model<TBusinessEmployeeExtendIn
/** /**
* B端维护的入职时间 * B端维护的入职时间
*/ */
private LocalDate businessEnjoinDate; private LocalDateTime businessEnjoinDate;
/** /**
* B端维护的离职原因 * B端维护的离职原因
......
...@@ -55,6 +55,7 @@ import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprSocialProperties; ...@@ -55,6 +55,7 @@ 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;
...@@ -1670,7 +1671,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1670,7 +1671,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()); businessVo.setBusinessEnjoinDate(tBusinessEmployeeExtendInfo.getBusinessEnjoinDate().toLocalDate());
} }
if(StringUtils.isNotBlank(tBusinessEmployeeExtendInfo.getBusinessPost())) { if(StringUtils.isNotBlank(tBusinessEmployeeExtendInfo.getBusinessPost())) {
businessVo.setBusinessPost(tBusinessEmployeeExtendInfo.getBusinessPost()); businessVo.setBusinessPost(tBusinessEmployeeExtendInfo.getBusinessPost());
......
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -17,11 +18,12 @@ import java.time.LocalDateTime; ...@@ -17,11 +18,12 @@ import java.time.LocalDateTime;
@TableName(value ="t_vacation_monitor") @TableName(value ="t_vacation_monitor")
@Data @Data
public class TVacationMonitor extends Model<TVacationMonitor> { public class TVacationMonitor extends Model<TVacationMonitor> {
/** /**
* 主键 *
*/ */
@TableId(type = IdType.AUTO) @TableId(type = IdType.ASSIGN_ID)
private Integer id; @Schema(description = "")
private String id;
/** /**
* 年份 * 年份
......
...@@ -56,7 +56,7 @@ public class TVacationMonitorClearLog extends Model<TVacationMonitorClearLog> { ...@@ -56,7 +56,7 @@ public class TVacationMonitorClearLog extends Model<TVacationMonitorClearLog> {
/** /**
* 年假监控id * 年假监控id
*/ */
private Integer vacationMonitorId; private String vacationMonitorId;
@TableField(exist = false) @TableField(exist = false)
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
...@@ -20,11 +20,11 @@ import java.time.LocalDateTime; ...@@ -20,11 +20,11 @@ import java.time.LocalDateTime;
@TableName(value ="t_vacation_rule_config") @TableName(value ="t_vacation_rule_config")
@Data @Data
public class TVacationRuleConfig extends Model<TVacationRuleConfig> { public class TVacationRuleConfig extends Model<TVacationRuleConfig> {
/** /**
* 主键 *
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
private Integer id; private String id;
/** /**
* 假期类型 1年假 * 假期类型 1年假
......
...@@ -24,7 +24,7 @@ public class TVacationMonitorVO implements Serializable { ...@@ -24,7 +24,7 @@ public class TVacationMonitorVO implements Serializable {
* 主键 * 主键
*/ */
@Schema(description = "主键") @Schema(description = "主键")
private Integer id; private String id;
/** /**
* 年份 * 年份
......
...@@ -22,7 +22,7 @@ public class VacationRuleConfigVO implements Serializable { ...@@ -22,7 +22,7 @@ public class VacationRuleConfigVO implements Serializable {
* 主键 * 主键
*/ */
@Schema(description = "主键") @Schema(description = "主键")
private Integer id; private String id;
/** /**
* 假期类型 1年假 * 假期类型 1年假
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<mapper namespace="com.yifu.cloud.plus.v1.business.mapper.vacation.TVacationRuleConfigMapper"> <mapper namespace="com.yifu.cloud.plus.v1.business.mapper.vacation.TVacationRuleConfigMapper">
<resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.business.entity.vacation.TVacationRuleConfig"> <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.business.entity.vacation.TVacationRuleConfig">
<id property="id" column="ID" jdbcType="INTEGER"/> <id property="id" column="ID" jdbcType="VARCHAR"/>
<result property="type" column="TYPE" jdbcType="CHAR"/> <result property="type" column="TYPE" jdbcType="CHAR"/>
<result property="vacationAutoInit" column="VACATION_AUTO_INIT" jdbcType="CHAR"/> <result property="vacationAutoInit" column="VACATION_AUTO_INIT" jdbcType="CHAR"/>
<result property="vacationInitDate" column="VACATION_INIT_DATE" jdbcType="DATE"/> <result property="vacationInitDate" column="VACATION_INIT_DATE" jdbcType="DATE"/>
......
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