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
93506ea6
Commit
93506ea6
authored
Nov 03, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
8020e05b
0aaecdd4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+12
-1
TFascTemplateDetailMapper.xml
...z/src/main/resources/mapper/TFascTemplateDetailMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
93506ea6
...
...
@@ -60,6 +60,8 @@ public class FascUtil {
private
static
final
String
DATA_COVER
=
"dataCover"
;
private
static
final
String
DATE_FORMAT
=
"dateFormat"
;
private
static
final
String
YEAR_STR
=
"年"
;
private
static
final
String
MONTH_STR
=
"个月"
;
private
static
final
SerializerFeature
[]
features
=
new
SerializerFeature
[]{
WriteMapNullValue
,
WriteNullNumberAsZero
,
WriteNullListAsEmpty
,
...
...
@@ -459,7 +461,16 @@ public class FascUtil {
fieldName
=
detail
.
getHrFieldId
();
fieldNameChinese
=
detail
.
getHrField
();
if
(
FascConstants
.
CONTRACT_DURATION
.
equals
(
fieldName
))
{
fieldValue
=
contract
.
getContractDurationYear
()
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
contract
.
getContractDurationMonth
();
if
(
Common
.
isNotNull
(
contract
.
getContractDurationYear
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
contract
.
getContractDurationYear
()))
{
fieldValue
=
contract
.
getContractDurationYear
()
+
YEAR_STR
;
}
if
(
Common
.
isNotNull
(
contract
.
getContractDurationMonth
())
&&
!
CommonConstants
.
ZERO_STRING
.
equals
(
contract
.
getContractDurationMonth
()))
{
if
(
Common
.
isNotNull
(
fieldValue
))
{
fieldValue
+=
contract
.
getContractDurationMonth
()
+
MONTH_STR
;
}
else
{
fieldValue
=
contract
.
getContractDurationMonth
()
+
MONTH_STR
;
}
}
}
else
if
(
FascConstants
.
DISPATCH_PERIOD
.
equals
(
fieldName
))
{
fieldValue
=
contract
.
getDispatchPeriodYear
()
+
CommonConstants
.
CENTER_SPLIT_LINE_STRING
+
contract
.
getDispatchPeriodMonth
();
}
else
if
(
FascConstants
.
EMP_SEX
.
equals
(
fieldName
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascTemplateDetailMapper.xml
View file @
93506ea6
...
...
@@ -175,7 +175,7 @@
FROM t_fasc_template_detail a
left join t_fasc_template b on a.sign_template_id = b.sign_template_id
left join t_fasc_hr_field h on h.hr_field_id = a.hr_field_id and h.hr_field = a.hr_field
where b.delete_Flag = '0' and a.hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId}
where b.delete_Flag = '0' and a.
delete_flag = '0' and a.
hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId}
</select>
<!--tFascTemplateDetail简单分页查询-->
...
...
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