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
50d25213
Commit
50d25213
authored
Jun 23, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
5496fb45
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
39 deletions
+33
-39
TEmployeeContractPre.java
...ud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
+0
-4
EmployeeRegistrationPreVo.java
...d/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
+1
-2
TEmployeeContractPreVo.java
...loud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
+2
-2
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+3
-8
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+27
-23
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeContractPre.java
View file @
50d25213
...
...
@@ -91,7 +91,6 @@ public class TEmployeeContractPre extends BaseEntity {
@Schema
(
description
=
"法大大模版名称"
)
private
String
fadadaTemplate
;
@Schema
(
description
=
"数据来源1客户端 2客服端"
)
private
String
dataSource
;
...
...
@@ -102,16 +101,13 @@ public class TEmployeeContractPre extends BaseEntity {
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
expectedConfirmTime
;
@Schema
(
description
=
"预计发起时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
LocalDateTime
expectedCollectionTime
;
@Schema
(
description
=
"确认人"
)
private
String
confirmUser
;
@Schema
(
description
=
"合同名称"
)
private
String
contractName
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeRegistrationPreVo.java
View file @
50d25213
...
...
@@ -56,7 +56,6 @@ public class EmployeeRegistrationPreVo implements Serializable {
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
private
String
townCode
;
@Schema
(
description
=
"员工姓名"
)
private
String
employeeName
;
...
...
@@ -124,7 +123,7 @@ public class EmployeeRegistrationPreVo implements Serializable {
private
List
<
TEmployeeInsurancePreVo
>
employeeInsurancePreVos
;
@Schema
(
description
=
"合同待派单信息"
)
private
TEmployeeContractPreVo
employeeContractPreVo
;
private
TEmployeeContractPreVo
employeeContractPreVo
s
;
@Schema
(
description
=
"附件集合"
)
private
List
<
TAttaInfoSaveVo
>
attaList
;
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TEmployeeContractPreVo.java
View file @
50d25213
...
...
@@ -218,8 +218,8 @@ public class TEmployeeContractPreVo extends RowIndex implements Serializable {
/**
* 签订期限
*/
@ExcelAttribute
(
name
=
"签订期限"
)
@Schema
(
description
=
"签订期限"
)
@ExcelAttribute
(
name
=
"签订期限
0 固定期限 1 无固定期限 3.以完成一定工作任务为期限
"
)
@Schema
(
description
=
"签订期限
0 固定期限 1 无固定期限 3.以完成一定工作任务为期限
"
)
private
String
contractTerm
;
@ExcelAttribute
(
name
=
"合同年限-年"
)
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
50d25213
...
...
@@ -1328,13 +1328,11 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
}
pre
.
setInsurancePreList
(
oldList
);
}
List
<
TAttaInfo
>
attaInfoAll
=
new
ArrayList
<>();
//获取合同待签订数据
TEmployeeContractPre
contract
=
contractPreMapper
.
selectOne
(
Wrappers
.<
TEmployeeContractPre
>
query
().
lambda
()
.
eq
(
TEmployeeContractPre:
:
getRegisterId
,
id
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
contract
))
{
pre
.
setEmployeeContractPre
(
contract
);
//附件赋值
List
<
TAttaInfo
>
attaContractInfo
=
attaInfoService
.
list
(
Wrappers
.<
TAttaInfo
>
query
().
lambda
()
.
eq
(
TAttaInfo:
:
getDomainId
,
contract
.
getId
()));
...
...
@@ -1345,7 +1343,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
url
=
ossUtil
.
getObjectUrl
(
null
,
a
.
getAttaSrc
());
a
.
setAttaUrl
(
null
!=
url
?
url
.
toString
():
""
);
}
attaInfoAll
.
addAll
(
attaContractInfo
);
contract
.
setAttaList
(
attaContractInfo
);
pre
.
setEmployeeContractPre
(
contract
);
}
}
...
...
@@ -1358,13 +1357,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
url
=
ossUtil
.
getObjectUrl
(
null
,
a
.
getAttaSrc
());
a
.
setAttaUrl
(
null
!=
url
?
url
.
toString
():
""
);
}
attaInfoAll
.
addAll
(
attaInfo
);
}
if
(!
attaInfoAll
.
isEmpty
())
{
pre
.
setAttaList
(
attaInfoAll
);
pre
.
setAttaList
(
attaInfo
);
}
}
return
pre
;
}
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
50d25213
...
...
@@ -600,8 +600,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//1.9.12合同自动化校验逻辑
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
null
!=
preVo
.
getEmployeeContractPreVo
())
{
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVo
();
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
null
!=
preVo
.
getEmployeeContractPreVo
s
())
{
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVo
s
();
//根据身份证号码和项目编号查询合同
TEmployeeAutoRegistCheckVo
cardVo
=
new
TEmployeeAutoRegistCheckVo
();
cardVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
...
...
@@ -644,17 +644,19 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//生成档案待建档数据
initRegistPreInfo
(
registration
,
preVo
,
user
,
CommonConstants
.
ZERO_STRING
);
R
<
String
>
domainR
=
archivesDaprUtil
.
saveRegistPreInfo
(
preVo
);
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
())
&&
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
for
(
TEmployeeInsurancePreVo
insurancePreVo
:
preVo
.
getEmployeeInsurancePreVos
())
{
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
()))
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
for
(
TEmployeeInsurancePreVo
insurancePreVo
:
preVo
.
getEmployeeInsurancePreVos
())
{
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
}
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
i
nsuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
if
(
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVo
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getEmployeeContractPreVo
().
getContractFlag
()))
{
i
f
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
null
!=
preVo
.
getEmployeeContractPreVos
()
&&
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVos
().
getContractFlag
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
preVo
.
getEmployeeContractPreVo
s
().
getContractFlag
()))
{
//生成合同待购买数据
initContractPreInfo
(
registration
,
preVo
.
getEmployeeContractPreVo
(),
user
,
domainR
.
getData
());
initContractPreInfo
(
registration
,
preVo
.
getEmployeeContractPreVo
s
(),
user
,
domainR
.
getData
());
}
}
}
catch
(
Exception
e
)
{
...
...
@@ -891,8 +893,8 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//1.9.12合同自动化校验逻辑
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
null
!=
preVo
.
getEmployeeContractPreVo
())
{
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVo
();
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
null
!=
preVo
.
getEmployeeContractPreVo
s
())
{
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVo
s
();
//根据身份证号码和项目编号查询合同
TEmployeeAutoRegistCheckVo
cardVo
=
new
TEmployeeAutoRegistCheckVo
();
cardVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
...
...
@@ -949,15 +951,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//生成档案待建档数据
initRegistPreInfo
(
registration
,
preVo
,
user
,
CommonConstants
.
ZERO_STRING
);
R
<
String
>
domainR
=
archivesDaprUtil
.
saveRegistPreInfo
(
preVo
);
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
())
&&
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
TEmployeeInsurancePreVo
insurancePreVo
=
preVo
.
getEmployeeInsurancePreVos
().
get
(
0
);
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVo
();
if
(
Common
.
isNotNull
(
employeeContractPreVo
)
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractFlag
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
()))
{
if
(
Common
.
isNotNull
(
domainR
)
&&
Common
.
isNotNull
(
domainR
.
getData
()))
{
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//生成商险待购买的数据
TEmployeeInsurancePreVo
insurancePreVo
=
preVo
.
getEmployeeInsurancePreVos
().
get
(
0
);
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVos
();
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
employeeContractPreVo
)
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractFlag
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
()))
{
//生成合同待购买数据
initContractPreInfo
(
registration
,
employeeContractPreVo
,
user
,
domainR
.
getData
());
}
...
...
@@ -1097,7 +1101,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
initInsruancePreInfo
(
registrationNow
,
insurancePreVo
,
user
,
domainR
.
getData
());
}
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVo
();
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVo
s
();
if
(
Common
.
isNotNull
(
employeeContractPreVo
)
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractFlag
())
&&
CommonConstants
.
ONE_STRING
.
equals
(
employeeContractPreVo
.
getContractFlag
()))
{
//生成合同待购买数据
...
...
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