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
4666f8de
Commit
4666f8de
authored
Oct 23, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
0a8eb4b6
25de81c6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
155 additions
and
30 deletions
+155
-30
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+21
-0
TFascCompany.java
...yifu/cloud/plus/v1/yifu/archives/entity/TFascCompany.java
+8
-0
TFascTemplate.java
...ifu/cloud/plus/v1/yifu/archives/entity/TFascTemplate.java
+14
-0
FascController.java
...loud/plus/v1/yifu/archives/controller/FascController.java
+1
-0
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+103
-28
TFascCompanyMapper.xml
...ives-biz/src/main/resources/mapper/TFascCompanyMapper.xml
+3
-1
TFascTemplateMapper.xml
...ves-biz/src/main/resources/mapper/TFascTemplateMapper.xml
+5
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
4666f8de
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.baomidou.mybatisplus.annotation.*
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -57,6 +58,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -57,6 +58,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同"
)
@Schema
(
description
=
"合同类型,标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同"
)
private
String
contractType
;
private
String
contractType
;
@ExcelAttribute
(
name
=
"签署方式"
,
isDataId
=
true
,
readConverterExp
=
"0=待确认,1=待发起,2=线下签待审核,3=线下签审核不通过4=线下签待归档5=发起失败6=签署中7=签署失败8=电子待归档9=已完结10=撤销签署"
)
@Schema
(
description
=
"状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9已完结10撤销签署"
)
@Schema
(
description
=
"状态,0待确认,1待发起,2线下签待审核,3线下签审核不通过4线下签待归档5发起失败6签署中7签署失败8电子待归档9已完结10撤销签署"
)
private
String
processStatus
;
private
String
processStatus
;
...
@@ -69,9 +71,11 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -69,9 +71,11 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"前端客服登录名"
)
@Schema
(
description
=
"前端客服登录名"
)
private
String
customerUserLoginname
;
private
String
customerUserLoginname
;
@ExcelAttribute
(
name
=
"签署方式"
,
isDataId
=
true
,
readConverterExp
=
"0=电子签,1=线下签"
)
@Schema
(
description
=
"签署方式1线下签0电子签"
)
@Schema
(
description
=
"签署方式1线下签0电子签"
)
private
String
signType
;
private
String
signType
;
@ExcelAttribute
(
name
=
"是否撤销签署"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否撤销签署0是1否"
)
@Schema
(
description
=
"是否撤销签署0是1否"
)
private
String
signFlag
;
private
String
signFlag
;
...
@@ -97,6 +101,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -97,6 +101,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"电子签转线下签操作时间"
)
@Schema
(
description
=
"电子签转线下签操作时间"
)
private
Date
changeTypeTime
;
private
Date
changeTypeTime
;
@ExcelAttribute
(
name
=
"是否已建档"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否已建档 0是 1否"
)
@Schema
(
description
=
"是否已建档 0是 1否"
)
private
String
archivesIsCreate
;
private
String
archivesIsCreate
;
...
@@ -129,6 +134,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -129,6 +134,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"签订类型"
)
@Schema
(
description
=
"签订类型"
)
private
String
situation
;
private
String
situation
;
@ExcelAttribute
(
name
=
"签订期限"
,
isDataId
=
true
,
readConverterExp
=
"0=已完成一定工作任务为期限,1=固定期限,2=无固定期限"
)
@Schema
(
description
=
"签订期限 0已完成一定工作任务为期限、1固定期限、2无固定期限"
)
@Schema
(
description
=
"签订期限 0已完成一定工作任务为期限、1固定期限、2无固定期限"
)
private
String
contractTerm
;
private
String
contractTerm
;
...
@@ -151,6 +157,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -151,6 +157,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"工作任务"
)
@Schema
(
description
=
"工作任务"
)
private
String
task
;
private
String
task
;
@ExcelAttribute
(
name
=
"任务类型"
,
isDataId
=
true
,
readConverterExp
=
"0=不同员工不同任务自定义,1=所有员工任务相同"
)
@Schema
(
description
=
"任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同"
)
@Schema
(
description
=
"任务类型: 0 不同员工不同任务自定义 1 所有员工任务相同"
)
private
String
taskType
;
private
String
taskType
;
...
@@ -160,15 +167,18 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -160,15 +167,18 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"配置名称"
)
@Schema
(
description
=
"配置名称"
)
private
String
configName
;
private
String
configName
;
@ExcelAttribute
(
name
=
"是否允许修改"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否允许修改 0是 1否"
)
@Schema
(
description
=
"是否允许修改 0是 1否"
)
private
String
updateFlag
;
private
String
updateFlag
;
@ExcelAttribute
(
name
=
"是否有试用期"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否有试用期 0是1否"
)
@Schema
(
description
=
"是否有试用期 0是1否"
)
private
String
tryPeriodType
;
private
String
tryPeriodType
;
@Schema
(
description
=
"试用期(单位月)"
)
@Schema
(
description
=
"试用期(单位月)"
)
private
String
tryPeriod
;
private
String
tryPeriod
;
@ExcelAttribute
(
name
=
"工资形式"
,
isDataId
=
true
,
readConverterExp
=
"1=计时工资,2=计件工资,3=其他"
)
@Schema
(
description
=
"工资形式 1.计时工资 2.计件工资 3.其他"
)
@Schema
(
description
=
"工资形式 1.计时工资 2.计件工资 3.其他"
)
private
String
salaryType
;
private
String
salaryType
;
...
@@ -187,6 +197,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -187,6 +197,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"用工单位名称"
)
@Schema
(
description
=
"用工单位名称"
)
private
String
workingCompany
;
private
String
workingCompany
;
@ExcelAttribute
(
name
=
"工时制"
,
isDataId
=
true
,
readConverterExp
=
"1=标准工时,2=综合工时,3=不定时工时制"
)
@Schema
(
description
=
"工时制(数据字典) 1标准工时 2 综合工时 3不定时工时制"
)
@Schema
(
description
=
"工时制(数据字典) 1标准工时 2 综合工时 3不定时工时制"
)
private
String
workingHours
;
private
String
workingHours
;
...
@@ -214,6 +225,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -214,6 +225,7 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"工资发放时间"
)
@Schema
(
description
=
"工资发放时间"
)
private
String
paymentTime
;
private
String
paymentTime
;
@ExcelAttribute
(
name
=
"工资发放方式"
,
isDataId
=
true
,
readConverterExp
=
"0=直接发放,1=委托银行代发"
)
@Schema
(
description
=
"工资发放方式 0 直接发放/1委托银行代发"
)
@Schema
(
description
=
"工资发放方式 0 直接发放/1委托银行代发"
)
private
String
paymentType
;
private
String
paymentType
;
...
@@ -231,6 +243,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -231,6 +243,7 @@ public class TEmployeeContractPre extends BaseEntity {
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Date
dispatchPeriodEnd
;
private
Date
dispatchPeriodEnd
;
@ExcelAttribute
(
name
=
"工作方式"
,
isDataId
=
true
,
readConverterExp
=
"0=第一种方式,1=第二种方式"
)
@Schema
(
description
=
"工作方式 0 第一种方式 1 第二种方式"
)
@Schema
(
description
=
"工作方式 0 第一种方式 1 第二种方式"
)
private
String
workType
;
private
String
workType
;
...
@@ -257,15 +270,20 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -257,15 +270,20 @@ public class TEmployeeContractPre extends BaseEntity {
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
Date
internshipPeriodEnd
;
private
Date
internshipPeriodEnd
;
@ExcelAttribute
(
name
=
"合同岗位"
,
isDataId
=
true
,
readConverterExp
=
"0=固定岗位,1=等于档案处维护,2=自定义"
)
@Schema
(
description
=
"合同岗位 0 固定岗位 1 等于档案处维护 2 自定义"
)
@Schema
(
description
=
"合同岗位 0 固定岗位 1 等于档案处维护 2 自定义"
)
private
String
postType
;
private
String
postType
;
@ExcelAttribute
(
name
=
"入职确认选择"
,
isDataId
=
true
,
readConverterExp
=
"0=配置方案内选择,1=自定义,2=配置方案+自定义"
)
@Schema
(
description
=
"入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义"
)
@Schema
(
description
=
"入职确认选择 0 配置方案内选择、1 自定义 2 配置方案+自定义"
)
private
String
confirmEmpSelect
;
private
String
confirmEmpSelect
;
@ExcelAttribute
(
name
=
"超时未确认是否触发签署任务"
,
isDataId
=
true
,
readConverterExp
=
"0=自动触发,1=不触发"
)
@Schema
(
description
=
"超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发"
)
@Schema
(
description
=
"超时未确认是否触发签署任务(电子签) 0 自动触发 1 不触发"
)
private
String
timeoutElecSign
;
private
String
timeoutElecSign
;
@ExcelAttribute
(
name
=
"合同截止日期类型"
,
isDataId
=
true
,
readConverterExp
=
"0=合同年限推算,1=同商务合同一致,2=已完成固定工作位期限"
)
@Schema
(
description
=
"合同截止日期类型 0合同年限推算/1同商务合同一致/2已完成固定工作位期限"
)
@Schema
(
description
=
"合同截止日期类型 0合同年限推算/1同商务合同一致/2已完成固定工作位期限"
)
private
String
contractEndType
;
private
String
contractEndType
;
...
@@ -281,9 +299,11 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -281,9 +299,11 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"入离职登记主表id"
)
@Schema
(
description
=
"入离职登记主表id"
)
private
String
registerId
;
private
String
registerId
;
@ExcelAttribute
(
name
=
"是否已签署合同"
,
isDataId
=
true
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否已签署合同 0是1否"
)
@Schema
(
description
=
"是否已签署合同 0是1否"
)
private
String
contractFlag
;
private
String
contractFlag
;
@ExcelAttribute
(
name
=
"新合同发起时间"
,
isDataId
=
true
,
readConverterExp
=
"0=入职日期,3=入职3天后,7=入职1周后,14=入职2周后,21=入职3周后"
)
@Schema
(
description
=
"新合同发起时间 入职日期 0、入职3天后 3、入职1周后 7、入职2周后 14、入职3周后 21"
)
@Schema
(
description
=
"新合同发起时间 入职日期 0、入职3天后 3、入职1周后 7、入职2周后 14、入职3周后 21"
)
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
String
registType
;
private
String
registType
;
...
@@ -300,6 +320,7 @@ public class TEmployeeContractPre extends BaseEntity {
...
@@ -300,6 +320,7 @@ public class TEmployeeContractPre extends BaseEntity {
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
private
List
<
TAttaInfo
>
attaList
;
private
List
<
TAttaInfo
>
attaList
;
@ExcelAttribute
(
name
=
"超期标识"
,
isDataId
=
true
,
readConverterExp
=
"0=已超期,1=未超期"
)
@Schema
(
description
=
"超期标识 0已超期 1未超期"
)
@Schema
(
description
=
"超期标识 0已超期 1未超期"
)
private
String
overFlag
;
private
String
overFlag
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TFascCompany.java
View file @
4666f8de
...
@@ -87,5 +87,13 @@ public class TFascCompany extends BaseEntity {
...
@@ -87,5 +87,13 @@ public class TFascCompany extends BaseEntity {
@ExcelProperty
(
"openId"
)
@ExcelProperty
(
"openId"
)
@Schema
(
description
=
"openId"
)
@Schema
(
description
=
"openId"
)
private
String
openId
;
private
String
openId
;
/**
* 场景码
*/
@ExcelAttribute
(
name
=
"场景码"
,
maxLength
=
100
)
@Length
(
max
=
100
,
message
=
"场景码不能超过100个字符"
)
@ExcelProperty
(
"场景码"
)
@Schema
(
description
=
"场景码"
)
private
String
businessId
;
}
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TFascTemplate.java
View file @
4666f8de
...
@@ -163,6 +163,20 @@ public class TFascTemplate extends BaseEntity {
...
@@ -163,6 +163,20 @@ public class TFascTemplate extends BaseEntity {
@ExcelProperty
(
"必填是否已配置0未配置1部分配置2已配置"
)
@ExcelProperty
(
"必填是否已配置0未配置1部分配置2已配置"
)
@Schema
(
description
=
"必填是否已配置0未配置1部分配置2已配置"
)
@Schema
(
description
=
"必填是否已配置0未配置1部分配置2已配置"
)
private
String
isMustEdit
;
private
String
isMustEdit
;
/**
* 发起方ID
*/
@ExcelAttribute
(
name
=
"发起方ID"
)
@ExcelProperty
(
"发起方ID"
)
@Schema
(
description
=
"发起方ID"
)
private
String
companyActorId
;
/**
* 签署方ID
*/
@ExcelAttribute
(
name
=
"签署方ID"
)
@ExcelProperty
(
"签署方ID"
)
@Schema
(
description
=
"签署方ID"
)
private
String
personActorId
;
@TableField
(
exist
=
false
)
@TableField
(
exist
=
false
)
@ExcelProperty
(
"当前必填已配置数量"
)
@ExcelProperty
(
"当前必填已配置数量"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FascController.java
View file @
4666f8de
...
@@ -231,6 +231,7 @@ public class FascController {
...
@@ -231,6 +231,7 @@ public class FascController {
pre
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
9
]);
pre
.
setProcessStatus
(
CommonConstants
.
dingleDigitStrArray
[
9
]);
contractInfo
.
setIsFile
(
CommonConstants
.
ZERO_STRING
);
contractInfo
.
setIsFile
(
CommonConstants
.
ZERO_STRING
);
contractInfo
.
setContractNo
(
pre
.
getRequestId
());
tEmployeeContractInfoService
.
updateById
(
contractInfo
);
tEmployeeContractInfoService
.
updateById
(
contractInfo
);
}
}
tEmployeeContractPreService
.
updateById
(
pre
);
tEmployeeContractPreService
.
updateById
(
pre
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
4666f8de
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascCompanyMapper.xml
View file @
4666f8de
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"businessId"
column=
"business_id"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.id,
a.id,
...
@@ -47,7 +48,8 @@
...
@@ -47,7 +48,8 @@
a.CREATE_NAME,
a.CREATE_NAME,
a.CREATE_TIME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_BY,
a.UPDATE_TIME
a.UPDATE_TIME,
a.business_id
</sql>
</sql>
<sql
id=
"tFascCompany_where"
>
<sql
id=
"tFascCompany_where"
>
<if
test=
"tFascCompany != null"
>
<if
test=
"tFascCompany != null"
>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascTemplateMapper.xml
View file @
4666f8de
...
@@ -44,6 +44,8 @@
...
@@ -44,6 +44,8 @@
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
<result
property=
"companyActorId"
column=
"company_actor_id"
/>
<result
property=
"personActorId"
column=
"person_actor_id"
/>
<!-- 非数据库字段,用来比较厚,更新日志 -->
<!-- 非数据库字段,用来比较厚,更新日志 -->
<result
property=
"isMustNow"
column=
"is_must_now"
/>
<result
property=
"isMustNow"
column=
"is_must_now"
/>
...
@@ -84,7 +86,9 @@
...
@@ -84,7 +86,9 @@
a.CREATE_NAME,
a.CREATE_NAME,
a.CREATE_TIME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_BY,
a.UPDATE_TIME
a.UPDATE_TIME,
a.company_actor_id,
a.person_actor_id
</sql>
</sql>
<sql
id=
"tFascTemplate_where"
>
<sql
id=
"tFascTemplate_where"
>
<if
test=
"tFascTemplate != null"
>
<if
test=
"tFascTemplate != null"
>
...
...
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