Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
5a872f32
Commit
5a872f32
authored
Jun 18, 2025
by
chenyuxi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 瓜子档案表加字段
parent
2c713d8d
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
37 additions
and
9 deletions
+37
-9
TGzEmpInfo.java
...m/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
+4
-0
TGzOfferInfo.java
...yifu/cloud/plus/v1/yifu/archives/entity/TGzOfferInfo.java
+1
-1
TGzEmpInfoSearchVo.java
...fu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoSearchVo.java
+10
-0
TGzEmpInfoMapper.java
.../cloud/plus/v1/yifu/archives/mapper/TGzEmpInfoMapper.java
+2
-1
TGzEmpInfoServiceImpl.java
.../v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
+1
-0
TGzEmpInfoMapper.xml
...chives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
+15
-3
TGzOfferInfoMapper.xml
...ives-biz/src/main/resources/mapper/TGzOfferInfoMapper.xml
+4
-4
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TGzEmpInfo.java
View file @
5a872f32
...
...
@@ -58,6 +58,10 @@ public class TGzEmpInfo extends BaseEntity {
@ExcelProperty
(
"关联瓜子offerID"
)
@Schema
(
description
=
"关联瓜子offerID"
)
private
Integer
offerId
;
@Schema
(
description
=
"流程ID(瓜子推过来的主键)"
)
private
String
bizId
;
/**
* 档案推送状态(0:待推送;1:已推送)
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TGzOfferInfo.java
View file @
5a872f32
...
...
@@ -114,7 +114,7 @@ public class TGzOfferInfo extends BaseEntity {
@Length
(
max
=
20
,
message
=
"合同公司主体:公司信息表不能超过20个字符"
)
@ExcelProperty
(
"合同公司主体:公司信息表"
)
@Schema
(
description
=
"合同公司主体:公司信息表"
)
private
String
com
ра
n
у
;
private
String
com
pany
;
/**
* 姓名
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TGzEmpInfoSearchVo.java
View file @
5a872f32
...
...
@@ -20,6 +20,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.time.LocalDate
;
import
java.util.List
;
/**
...
...
@@ -37,6 +38,15 @@ public class TGzEmpInfoSearchVo extends TGzEmpInfo {
@Schema
(
description
=
"选中ID,多个逗号分割"
)
private
String
ids
;
/**
* 查询使用:提交档案时间开始
*/
private
LocalDate
createTimeStart
;
/**
* 查询使用:提交档案时间结束
*/
private
LocalDate
createTimeEnd
;
/**
* @Author fxj
* 查询数据起
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TGzEmpInfoMapper.java
View file @
5a872f32
...
...
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
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.vo.TGzEmpInfoSearchVo
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -38,5 +39,5 @@ public interface TGzEmpInfoMapper extends BaseMapper<TGzEmpInfo> {
* @param tGzEmpInfo 瓜子档案表
* @return
*/
IPage
<
TGzEmpInfo
>
getTGzEmpInfoPage
(
Page
<
TGzEmpInfo
>
page
,
@Param
(
"tGzEmpInfo"
)
TGzEmpInfo
tGzEmpInfo
);
IPage
<
TGzEmpInfo
>
getTGzEmpInfoPage
(
Page
<
TGzEmpInfo
>
page
,
@Param
(
"tGzEmpInfo"
)
TGzEmpInfo
SearchVo
tGzEmpInfo
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TGzEmpInfoServiceImpl.java
View file @
5a872f32
...
...
@@ -127,6 +127,7 @@ public class TGzEmpInfoServiceImpl extends ServiceImpl<TGzEmpInfoMapper, TGzEmpI
// 还未生成档案,取offer里的信息
if
(
Common
.
isEmpty
(
gzEmpInfo
)){
gzEmpInfoVo
.
setBizId
(
gzEmpInfo
.
getBizId
());
gzEmpInfoVo
.
setOfferId
(
offerId
);
gzEmpInfoVo
.
setName
(
gzOfferInfo
.
getName
());
gzEmpInfoVo
.
setNameAc
(
gzOfferInfo
.
getNameAc
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzEmpInfoMapper.xml
View file @
5a872f32
...
...
@@ -23,8 +23,9 @@
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.archives.mapper.TGzEmpInfoMapper"
>
<resultMap
id=
"tGzEmpInfoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.
entity.TGzEmpInf
o"
>
<resultMap
id=
"tGzEmpInfoMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.
vo.TGzEmpInfoSearchV
o"
>
<id
property=
"id"
column=
"id"
/>
<result
property=
"bizId"
column=
"biz_id"
/>
<result
property=
"offerId"
column=
"offer_id"
/>
<result
property=
"empPushStatus"
column=
"emp_push_status"
/>
<result
property=
"contractPushStatus"
column=
"contract_push_status"
/>
...
...
@@ -103,6 +104,7 @@
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
a.biz_id,
a.offer_id,
a.emp_push_status,
a.contract_push_status,
...
...
@@ -184,6 +186,9 @@
<if
test=
"tGzEmpInfo.id != null and tGzEmpInfo.id.trim() != ''"
>
AND a.id = #{tGzEmpInfo.id}
</if>
<if
test=
"tGzEmpInfo.bizId != null and tGzEmpInfo.bizId.trim() != ''"
>
AND a.biz_id = #{tGzEmpInfo.bizId}
</if>
<if
test=
"tGzEmpInfo.offerId != null "
>
AND a.offer_id = #{tGzEmpInfo.offerId}
</if>
...
...
@@ -202,6 +207,13 @@
<if
test=
"tGzEmpInfo.createTime != null"
>
AND a.create_time = #{tGzEmpInfo.createTime}
</if>
<!--查询提交档案时间-->
<if
test=
"tGzEmpInfo.createTimeStart != null "
>
AND a.create_time
>
= concat(#{tGzEmpInfo.createTimeStart},' 00:00:00')
</if>
<if
test=
"tGzEmpInfo.createTimeEnd != null "
>
AND a.create_time
<
= concat(#{tGzEmpInfo.createTimeEnd},' 23:59:59')
</if>
<if
test=
"tGzEmpInfo.createBy != null and tGzEmpInfo.createBy.trim() != ''"
>
AND a.create_by = #{tGzEmpInfo.createBy}
</if>
...
...
@@ -215,7 +227,7 @@
AND a.update_time = #{tGzEmpInfo.updateTime}
</if>
<if
test=
"tGzEmpInfo.name != null and tGzEmpInfo.name.trim() != ''"
>
AND a.name
= #{tGzEmpInfo.name}
AND a.name
like concat('%',#{tGzEmpInfo.name},'%')
</if>
<if
test=
"tGzEmpInfo.nameAc != null and tGzEmpInfo.nameAc.trim() != ''"
>
AND a.name_ac = #{tGzEmpInfo.nameAc}
...
...
@@ -263,7 +275,7 @@
AND a.national_id_type = #{tGzEmpInfo.nationalIdType}
</if>
<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
test=
"tGzEmpInfo.persistFlag != null and tGzEmpInfo.persistFlag.trim() != ''"
>
AND a.persist_flag = #{tGzEmpInfo.persistFlag}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TGzOfferInfoMapper.xml
View file @
5a872f32
...
...
@@ -33,7 +33,7 @@
<result
property=
"empType"
column=
"emp_type"
/>
<result
property=
"empTypeDescr"
column=
"emp_type_descr"
/>
<result
property=
"outSginType"
column=
"out_sgin_type"
/>
<result
property=
"com
раnу"
column=
"comраnу
"
/>
<result
property=
"com
pany"
column=
"company
"
/>
<result
property=
"name"
column=
"name"
/>
<result
property=
"nameAc"
column=
"name_ac"
/>
<result
property=
"lastNameAc"
column=
"last_name_ac"
/>
...
...
@@ -78,7 +78,7 @@
a.emp_type,
a.emp_type_descr,
a.out_sgin_type,
a.com
раnу
,
a.com
pany
,
a.name,
a.name_ac,
a.last_name_ac,
...
...
@@ -158,8 +158,8 @@
<if
test=
"tGzOfferInfo.outSginType != null and tGzOfferInfo.outSginType.trim() != ''"
>
AND a.out_sgin_type = #{tGzOfferInfo.outSginType}
</if>
<if
test=
"tGzOfferInfo.com
раnу != null and tGzOfferInfo.comраnу
.trim() != ''"
>
AND a.com
раnу = #{tGzOfferInfo.comраnу
}
<if
test=
"tGzOfferInfo.com
pany != null and tGzOfferInfo.company
.trim() != ''"
>
AND a.com
pany = #{tGzOfferInfo.company
}
</if>
<if
test=
"tGzOfferInfo.name != null and tGzOfferInfo.name.trim() != ''"
>
AND a.name like concat('%',#{tGzOfferInfo.name},'%')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment