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
0ee61b86
Commit
0ee61b86
authored
Aug 15, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
稿酬
parent
fa31b382
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
3 deletions
+30
-3
TSettleDomainServiceImpl.java
.../yifu/archives/service/impl/TSettleDomainServiceImpl.java
+1
-1
TSettleDomainMapper.xml
...ves-biz/src/main/resources/mapper/TSettleDomainMapper.xml
+3
-1
TSalaryStandard.java
...ifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
+11
-0
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+10
-1
SalaryAccountUtil.java
...ifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
+5
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TSettleDomainServiceImpl.java
View file @
0ee61b86
...
...
@@ -100,7 +100,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
@Override
public
TSettleDomainSelectVo
getSettleDomainVoById
(
String
id
)
{
return
baseMapper
.
selectSettleDomainSelectVos
ById
(
id
);
return
baseMapper
.
getSettleDomainVo
ById
(
id
);
}
@Override
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml
View file @
0ee61b86
...
...
@@ -186,7 +186,8 @@
c.customerId,
c.CUSTOMER_NAME as 'customerName',
c.CUSTOMER_CODE as 'customerCode',
c.INDUSTRY_BELONG as 'industryBelong'
c.INDUSTRY_BELONG as 'industryBelong',
t.COVER_NAME as 'businessSubjectName'
FROM
t_settle_domain a
LEFT JOIN (
...
...
@@ -195,6 +196,7 @@
INDUSTRY_BELONG,
CUSTOMER_CODE from t_customer_info
) c ON a.CUSTOMER_ID = c.customerId
LEFT JOIN t_table_head_salary_cover t on a.id=t.DEPART_ID and t.type = 0
WHERE a.id=#{id} GROUP BY a.id
</select>
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
View file @
0ee61b86
...
...
@@ -227,6 +227,17 @@ public class TSalaryStandard extends BaseEntity {
@ExcelAttribute
(
name
=
"含有特殊金额的强行提交的备注"
)
private
String
haveSpecialRemark
;
/**
* 本月是否重复金额0:否;1:是重复导入的
*/
@ExcelAttribute
(
name
=
"本月是否重复金额0:否;1:是重复导入的"
)
@ExcelProperty
(
"本月是否重复金额0:否;1:是重复导入的"
)
private
Integer
isRepeat
;
@Schema
(
description
=
"本月重复金额的备注"
,
name
=
"repeatRemark"
)
@ExcelAttribute
(
name
=
"本月重复金额的备注"
)
private
String
repeatRemark
;
/**
* 提交备注
*/
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
0ee61b86
...
...
@@ -501,6 +501,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
boolean
haveSalaryFlag
=
false
;
// 是否含有特殊金额false:否;true:是
boolean
haveSpecialFlag
=
false
;
// 是否重复金额false:否;true:是
boolean
repeatFlag
=
false
;
// 年终奖错误信息合计:
StringBuilder
yearEndInfo
=
new
StringBuilder
();
List
<
String
>
idCardList
=
new
ArrayList
<>();
...
...
@@ -539,6 +541,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if
(!
haveSpecialFlag
&&
a
.
getHaveSpecialFlag
()
!=
null
&&
a
.
getHaveSpecialFlag
()
==
CommonConstants
.
ONE_INT
)
{
haveSpecialFlag
=
true
;
}
if
(!
repeatFlag
&&
a
.
getIsRepeat
()
!=
null
&&
a
.
getIsRepeat
()
==
CommonConstants
.
ONE_INT
)
{
repeatFlag
=
true
;
}
checkYearFinalStyle
=
a
.
getAnnualBonusType
();
if
(
Common
.
isNotNull
(
a
.
getTaxMonth
()))
{
maxYearMonth
=
DateUtil
.
getMaxYearMonth
(
a
.
getTaxMonth
());
...
...
@@ -775,7 +780,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
salary
.
setSettlementAmount
(
relaySalarySum
);
salary
.
setHaveSalaryFlag
(
CommonConstants
.
ZERO_INT
);
salary
.
setHaveSpecialFlag
(
CommonConstants
.
ZERO_INT
);
if
(
haveSalaryFlag
||
haveSpecialFlag
||
ownNum
>
0
)
{
salary
.
setIsRepeat
(
CommonConstants
.
ZERO_INT
);
if
(
haveSalaryFlag
||
haveSpecialFlag
||
ownNum
>
0
||
repeatFlag
)
{
salary
.
setStatus
(
SalaryConstants
.
AUDIT_STATUS
[
0
]);
if
(
haveSalaryFlag
)
{
salary
.
setHaveSalaryFlag
(
CommonConstants
.
ONE_INT
);
...
...
@@ -783,6 +789,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
if
(
haveSpecialFlag
)
{
salary
.
setHaveSpecialFlag
(
CommonConstants
.
ONE_INT
);
}
if
(
repeatFlag
)
{
salary
.
setIsRepeat
(
CommonConstants
.
ONE_INT
);
}
}
else
{
salary
.
setStatus
(
SalaryConstants
.
AUDIT_STATUS
[
2
]);
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @
0ee61b86
...
...
@@ -274,6 +274,11 @@ public class SalaryAccountUtil implements Serializable {
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
if
(
"4"
.
equals
(
salaryType
)
&&
actualSalarySum
==
null
)
{
error
=
"第"
+
(
i
+
2
)
+
"行:【稿酬】列_不可缺少"
;
errorList
.
add
(
new
ErrorMessage
((
i
+
2
),
error
));
continue
;
}
// 应发、实发、实发劳务费不可都为空
if
(
relaySalary
==
null
&&
actualSalarySum
==
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