Commit 5a872f32 authored by chenyuxi's avatar chenyuxi

feat: 瓜子档案表加字段

parent 2c713d8d
...@@ -58,6 +58,10 @@ public class TGzEmpInfo extends BaseEntity { ...@@ -58,6 +58,10 @@ public class TGzEmpInfo extends BaseEntity {
@ExcelProperty("关联瓜子offerID") @ExcelProperty("关联瓜子offerID")
@Schema(description = "关联瓜子offerID") @Schema(description = "关联瓜子offerID")
private Integer offerId; private Integer offerId;
@Schema(description = "流程ID(瓜子推过来的主键)")
private String bizId;
/** /**
* 档案推送状态(0:待推送;1:已推送) * 档案推送状态(0:待推送;1:已推送)
*/ */
......
...@@ -114,7 +114,7 @@ public class TGzOfferInfo extends BaseEntity { ...@@ -114,7 +114,7 @@ public class TGzOfferInfo extends BaseEntity {
@Length(max = 20, message = "合同公司主体:公司信息表不能超过20个字符") @Length(max = 20, message = "合同公司主体:公司信息表不能超过20个字符")
@ExcelProperty("合同公司主体:公司信息表") @ExcelProperty("合同公司主体:公司信息表")
@Schema(description = "合同公司主体:公司信息表") @Schema(description = "合同公司主体:公司信息表")
private String comраnу; private String company;
/** /**
* 姓名 * 姓名
*/ */
......
...@@ -20,6 +20,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.*; ...@@ -20,6 +20,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDate;
import java.util.List; import java.util.List;
/** /**
...@@ -37,6 +38,15 @@ public class TGzEmpInfoSearchVo extends TGzEmpInfo { ...@@ -37,6 +38,15 @@ public class TGzEmpInfoSearchVo extends TGzEmpInfo {
@Schema(description = "选中ID,多个逗号分割") @Schema(description = "选中ID,多个逗号分割")
private String ids; private String ids;
/**
* 查询使用:提交档案时间开始
*/
private LocalDate createTimeStart;
/**
* 查询使用:提交档案时间结束
*/
private LocalDate createTimeEnd;
/** /**
* @Author fxj * @Author fxj
* 查询数据起 * 查询数据起
......
...@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoSearchVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -38,5 +39,5 @@ public interface TGzEmpInfoMapper extends BaseMapper<TGzEmpInfo> { ...@@ -38,5 +39,5 @@ public interface TGzEmpInfoMapper extends BaseMapper<TGzEmpInfo> {
* @param tGzEmpInfo 瓜子档案表 * @param tGzEmpInfo 瓜子档案表
* @return * @return
*/ */
IPage<TGzEmpInfo> getTGzEmpInfoPage(Page<TGzEmpInfo> page, @Param("tGzEmpInfo") TGzEmpInfo tGzEmpInfo); IPage<TGzEmpInfo> getTGzEmpInfoPage(Page<TGzEmpInfo> page, @Param("tGzEmpInfo") TGzEmpInfoSearchVo tGzEmpInfo);
} }
...@@ -127,6 +127,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI ...@@ -127,6 +127,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 还未生成档案,取offer里的信息 // 还未生成档案,取offer里的信息
if(Common.isEmpty(gzEmpInfo)){ if(Common.isEmpty(gzEmpInfo)){
gzEmpInfoVo.setBizId(gzEmpInfo.getBizId());
gzEmpInfoVo.setOfferId(offerId); gzEmpInfoVo.setOfferId(offerId);
gzEmpInfoVo.setName(gzOfferInfo.getName()); gzEmpInfoVo.setName(gzOfferInfo.getName());
gzEmpInfoVo.setNameAc(gzOfferInfo.getNameAc()); gzEmpInfoVo.setNameAc(gzOfferInfo.getNameAc());
......
...@@ -23,8 +23,9 @@ ...@@ -23,8 +23,9 @@
<mapper namespace="com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzEmpInfoMapper"> <mapper namespace="com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzEmpInfoMapper">
<resultMap id="tGzEmpInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo"> <resultMap id="tGzEmpInfoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TGzEmpInfoSearchVo">
<id property="id" column="id"/> <id property="id" column="id"/>
<result property="bizId" column="biz_id"/>
<result property="offerId" column="offer_id"/> <result property="offerId" column="offer_id"/>
<result property="empPushStatus" column="emp_push_status"/> <result property="empPushStatus" column="emp_push_status"/>
<result property="contractPushStatus" column="contract_push_status"/> <result property="contractPushStatus" column="contract_push_status"/>
...@@ -103,6 +104,7 @@ ...@@ -103,6 +104,7 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.id, a.id,
a.biz_id,
a.offer_id, a.offer_id,
a.emp_push_status, a.emp_push_status,
a.contract_push_status, a.contract_push_status,
...@@ -184,6 +186,9 @@ ...@@ -184,6 +186,9 @@
<if test="tGzEmpInfo.id != null and tGzEmpInfo.id.trim() != ''"> <if test="tGzEmpInfo.id != null and tGzEmpInfo.id.trim() != ''">
AND a.id = #{tGzEmpInfo.id} AND a.id = #{tGzEmpInfo.id}
</if> </if>
<if test="tGzEmpInfo.bizId != null and tGzEmpInfo.bizId.trim() != ''">
AND a.biz_id = #{tGzEmpInfo.bizId}
</if>
<if test="tGzEmpInfo.offerId != null "> <if test="tGzEmpInfo.offerId != null ">
AND a.offer_id = #{tGzEmpInfo.offerId} AND a.offer_id = #{tGzEmpInfo.offerId}
</if> </if>
...@@ -202,6 +207,13 @@ ...@@ -202,6 +207,13 @@
<if test="tGzEmpInfo.createTime != null"> <if test="tGzEmpInfo.createTime != null">
AND a.create_time = #{tGzEmpInfo.createTime} AND a.create_time = #{tGzEmpInfo.createTime}
</if> </if>
<!--查询提交档案时间-->
<if test="tGzEmpInfo.createTimeStart != null ">
AND a.create_time &gt;= concat(#{tGzEmpInfo.createTimeStart},' 00:00:00')
</if>
<if test="tGzEmpInfo.createTimeEnd != null ">
AND a.create_time &lt;= concat(#{tGzEmpInfo.createTimeEnd},' 23:59:59')
</if>
<if test="tGzEmpInfo.createBy != null and tGzEmpInfo.createBy.trim() != ''"> <if test="tGzEmpInfo.createBy != null and tGzEmpInfo.createBy.trim() != ''">
AND a.create_by = #{tGzEmpInfo.createBy} AND a.create_by = #{tGzEmpInfo.createBy}
</if> </if>
...@@ -215,7 +227,7 @@ ...@@ -215,7 +227,7 @@
AND a.update_time = #{tGzEmpInfo.updateTime} AND a.update_time = #{tGzEmpInfo.updateTime}
</if> </if>
<if test="tGzEmpInfo.name != null and tGzEmpInfo.name.trim() != ''"> <if test="tGzEmpInfo.name != null and tGzEmpInfo.name.trim() != ''">
AND a.name = #{tGzEmpInfo.name} AND a.name like concat('%',#{tGzEmpInfo.name},'%')
</if> </if>
<if test="tGzEmpInfo.nameAc != null and tGzEmpInfo.nameAc.trim() != ''"> <if test="tGzEmpInfo.nameAc != null and tGzEmpInfo.nameAc.trim() != ''">
AND a.name_ac = #{tGzEmpInfo.nameAc} AND a.name_ac = #{tGzEmpInfo.nameAc}
...@@ -263,7 +275,7 @@ ...@@ -263,7 +275,7 @@
AND a.national_id_type = #{tGzEmpInfo.nationalIdType} AND a.national_id_type = #{tGzEmpInfo.nationalIdType}
</if> </if>
<if test="tGzEmpInfo.nationalId != null and tGzEmpInfo.nationalId.trim() != ''"> <if test="tGzEmpInfo.nationalId != null and tGzEmpInfo.nationalId.trim() != ''">
AND a.national_id = #{tGzEmpInfo.nationalId} AND a.national_id like concat('%',#{tGzEmpInfo.nationalId},'%')
</if> </if>
<if test="tGzEmpInfo.persistFlag != null and tGzEmpInfo.persistFlag.trim() != ''"> <if test="tGzEmpInfo.persistFlag != null and tGzEmpInfo.persistFlag.trim() != ''">
AND a.persist_flag = #{tGzEmpInfo.persistFlag} AND a.persist_flag = #{tGzEmpInfo.persistFlag}
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<result property="empType" column="emp_type"/> <result property="empType" column="emp_type"/>
<result property="empTypeDescr" column="emp_type_descr"/> <result property="empTypeDescr" column="emp_type_descr"/>
<result property="outSginType" column="out_sgin_type"/> <result property="outSginType" column="out_sgin_type"/>
<result property="comраnу" column="comраnу"/> <result property="company" column="company"/>
<result property="name" column="name"/> <result property="name" column="name"/>
<result property="nameAc" column="name_ac"/> <result property="nameAc" column="name_ac"/>
<result property="lastNameAc" column="last_name_ac"/> <result property="lastNameAc" column="last_name_ac"/>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
a.emp_type, a.emp_type,
a.emp_type_descr, a.emp_type_descr,
a.out_sgin_type, a.out_sgin_type,
a.comраnу, a.company,
a.name, a.name,
a.name_ac, a.name_ac,
a.last_name_ac, a.last_name_ac,
...@@ -158,8 +158,8 @@ ...@@ -158,8 +158,8 @@
<if test="tGzOfferInfo.outSginType != null and tGzOfferInfo.outSginType.trim() != ''"> <if test="tGzOfferInfo.outSginType != null and tGzOfferInfo.outSginType.trim() != ''">
AND a.out_sgin_type = #{tGzOfferInfo.outSginType} AND a.out_sgin_type = #{tGzOfferInfo.outSginType}
</if> </if>
<if test="tGzOfferInfo.comраnу != null and tGzOfferInfo.comраnу.trim() != ''"> <if test="tGzOfferInfo.company != null and tGzOfferInfo.company.trim() != ''">
AND a.comраnу = #{tGzOfferInfo.comраnу} AND a.company = #{tGzOfferInfo.company}
</if> </if>
<if test="tGzOfferInfo.name != null and tGzOfferInfo.name.trim() != ''"> <if test="tGzOfferInfo.name != null and tGzOfferInfo.name.trim() != ''">
AND a.name like concat('%',#{tGzOfferInfo.name},'%') AND a.name like concat('%',#{tGzOfferInfo.name},'%')
......
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