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
444643d2
Commit
444643d2
authored
Oct 29, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.16-优化代码
parent
a6e8a7ff
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
1 deletion
+22
-1
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+22
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
444643d2
...
@@ -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,25 @@ public class FascUtil {
...
@@ -472,8 +476,25 @@ 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