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
6db2f1d6
Commit
6db2f1d6
authored
Oct 30, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
710b3933
0288b28f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
2 deletions
+27
-2
TEmployeeContractPreController.java
...u/archives/controller/TEmployeeContractPreController.java
+2
-0
TEmployeeContractPreServiceImpl.java
...rchives/service/impl/TEmployeeContractPreServiceImpl.java
+2
-1
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+23
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeContractPreController.java
View file @
6db2f1d6
...
@@ -236,6 +236,8 @@ public class TEmployeeContractPreController {
...
@@ -236,6 +236,8 @@ public class TEmployeeContractPreController {
.
or
()
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
TWO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
TWO_INT
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
FOUR_INT
)
)
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
));
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_INT
));
return
R
.
ok
(
employeeContractInfo
);
return
R
.
ok
(
employeeContractInfo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractPreServiceImpl.java
View file @
6db2f1d6
...
@@ -300,7 +300,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -300,7 +300,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
Map
<
String
,
String
>
loginNameMap
=
new
HashMap
<>();
Map
<
String
,
String
>
loginNameMap
=
new
HashMap
<>();
//发起派单
//发起派单
List
<
ErrorMessage
>
errorMessageListAll
=
new
ArrayList
<>();
List
<
ErrorMessage
>
errorMessageListAll
=
new
ArrayList
<>();
List
<
EmployeeContractVO
>
excelVOList
=
baseMapper
.
getDisPatcherContractList
(
idList
,
CommonConstants
.
socialInfoStatus
,
type
);
List
<
EmployeeContractVO
>
excelVOList
=
baseMapper
.
getDisPatcherContractList
(
idList
,
Arrays
.
asList
(
"0"
,
"1"
,
"3"
,
"5"
,
"7"
,
"11"
)
,
type
);
// 拆分电子签和线下签
// 拆分电子签和线下签
List
<
EmployeeContractVO
>
electronicSignList
=
new
ArrayList
<>();
List
<
EmployeeContractVO
>
electronicSignList
=
new
ArrayList
<>();
...
@@ -389,6 +389,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
...
@@ -389,6 +389,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
singleContractList
.
add
(
contractVO
);
singleContractList
.
add
(
contractVO
);
List
<
ErrorMessage
>
singleErrorMessageList
=
new
ArrayList
<>();
List
<
ErrorMessage
>
singleErrorMessageList
=
new
ArrayList
<>();
singleContractList
.
add
(
contractVO
);
// 调用合同导入方法
// 调用合同导入方法
contractInfoService
.
importContract
(
singleContractList
,
singleErrorMessageList
);
contractInfoService
.
importContract
(
singleContractList
,
singleErrorMessageList
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
6db2f1d6
...
@@ -443,14 +443,18 @@ public class FascUtil {
...
@@ -443,14 +443,18 @@ public class FascUtil {
DocFieldValueInfo
dfv
;
DocFieldValueInfo
dfv
;
String
fieldValue
;
String
fieldValue
;
String
fieldName
;
String
fieldName
;
// 字段中文名
String
fieldNameChinese
;
for
(
TFascTemplateDetail
detail
:
detailList
)
{
for
(
TFascTemplateDetail
detail
:
detailList
)
{
if
(
Common
.
isNotNull
(
detail
.
getHrFieldId
())
&&
Common
.
isNotNull
(
detail
.
getHrField
()))
{
if
(
Common
.
isNotNull
(
detail
.
getHrFieldId
())
&&
Common
.
isNotNull
(
detail
.
getHrField
()))
{
fieldValue
=
null
;
dfv
=
new
DocFieldValueInfo
();
dfv
=
new
DocFieldValueInfo
();
dfv
.
setDocId
(
detail
.
getFascDocId
());
dfv
.
setDocId
(
detail
.
getFascDocId
());
dfv
.
setFieldId
(
detail
.
getFascFieldId
());
dfv
.
setFieldId
(
detail
.
getFascFieldId
());
// 转化字段
// 转化字段
fieldName
=
detail
.
getHrFieldId
();
fieldName
=
detail
.
getHrFieldId
();
fieldNameChinese
=
detail
.
getHrField
();
if
(
FascConstants
.
CONTRACT_DURATION
.
equals
(
fieldName
))
{
if
(
FascConstants
.
CONTRACT_DURATION
.
equals
(
fieldName
))
{
fieldValue
=
contract
.
getContractDurationYear
()
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
contract
.
getContractDurationMonth
();
fieldValue
=
contract
.
getContractDurationYear
()
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
contract
.
getContractDurationMonth
();
}
else
if
(
FascConstants
.
DISPATCH_PERIOD
.
equals
(
fieldName
))
{
}
else
if
(
FascConstants
.
DISPATCH_PERIOD
.
equals
(
fieldName
))
{
...
@@ -472,8 +476,26 @@ public class FascUtil {
...
@@ -472,8 +476,26 @@ public class FascUtil {
}
}
}
}
}
else
{
}
else
{
if
(
Common
.
isNotNull
(
fieldNameChinese
))
{
// 0=已完成一定工作任务为期限,1=固定期限,2=无固定期限
// 针对一个模板,三种类型,有的要开始时间,有的不要,这里做区分:
if
(
fieldNameChinese
.
contains
(
"无固定-"
))
{
if
(
CommonConstants
.
TWO_STRING
.
equals
(
contract
.
getContractTerm
()))
{
fieldValue
=
this
.
getContractFieldValueByReflection
(
contract
,
fieldName
,
detail
.
getFieldType
(),
detail
.
getFieldValue
());
fieldValue
=
this
.
getContractFieldValueByReflection
(
contract
,
fieldName
,
detail
.
getFieldType
(),
detail
.
getFieldValue
());
}
}
}
else
if
(
fieldNameChinese
.
contains
(
"固定-"
))
{
if
(
CommonConstants
.
ONE_STRING
.
equals
(
contract
.
getContractTerm
()))
{
fieldValue
=
this
.
getContractFieldValueByReflection
(
contract
,
fieldName
,
detail
.
getFieldType
(),
detail
.
getFieldValue
());
}
}
else
if
(
fieldNameChinese
.
contains
(
"完成任务-"
))
{
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
contract
.
getContractTerm
()))
{
fieldValue
=
this
.
getContractFieldValueByReflection
(
contract
,
fieldName
,
detail
.
getFieldType
(),
detail
.
getFieldValue
());
}
}
else
{
fieldValue
=
this
.
getContractFieldValueByReflection
(
contract
,
fieldName
,
detail
.
getFieldType
(),
detail
.
getFieldValue
());
}
}
}
if
(
Common
.
isNotNull
(
fieldValue
))
{
if
(
Common
.
isNotNull
(
fieldValue
))
{
dfv
.
setFieldValue
(
fieldValue
);
dfv
.
setFieldValue
(
fieldValue
);
docFieldValues
.
add
(
dfv
);
docFieldValues
.
add
(
dfv
);
...
...
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