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
35848004
Commit
35848004
authored
Aug 29, 2022
by
李灿灿
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature-licancan
parents
648c37cc
3acc35dd
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
68 additions
and
23 deletions
+68
-23
TInsuranceDetailServiceImpl.java
...s/service/insurance/impl/TInsuranceDetailServiceImpl.java
+1
-0
TInsuranceRefundMapper.xml
...in/resources/mapper/insurances/TInsuranceRefundMapper.xml
+3
-0
TStatisticsDeclarer.java
...cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.java
+3
-3
TMinSalaryController.java
.../plus/v1/yifu/salary/controller/TMinSalaryController.java
+2
-2
TStatisticsDeclarerMapper.java
...plus/v1/yifu/salary/mapper/TStatisticsDeclarerMapper.java
+1
-1
TMinSalaryService.java
.../cloud/plus/v1/yifu/salary/service/TMinSalaryService.java
+2
-0
TMinSalaryServiceImpl.java
...us/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java
+34
-0
TStatisticsBonusServiceImpl.java
...yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
+9
-4
TStatisticsDeclarerServiceImpl.java
...u/salary/service/impl/TStatisticsDeclarerServiceImpl.java
+1
-2
TStatisticsDeclarerMapper.xml
...z/src/main/resources/mapper/TStatisticsDeclarerMapper.xml
+10
-7
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+2
-4
No files found.
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java
View file @
35848004
...
...
@@ -5080,6 +5080,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @return {@link R}
*/
@Override
@Transactional
(
value
=
"insurancesTransactionManager"
,
rollbackFor
=
{
Exception
.
class
})
public
R
urgentUpdateIsUse
(
String
empIdcardNo
)
{
//员工身份证
if
(
StringUtils
.
isBlank
(
empIdcardNo
)){
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceRefundMapper.xml
View file @
35848004
...
...
@@ -26,6 +26,9 @@
set
REDUCE_HANDLE_STATUS = #{reduceHandleStatus},
REMARK = #{remark},
CREATE_NAME= #{createName},
CREATE_BY = #{createBy},
CREATE_TIME = #{createTime},
UPDATE_BY = #{createBy},
UPDATE_TIME = #{createTime}
where
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.java
View file @
35848004
...
...
@@ -89,14 +89,14 @@ public class TStatisticsDeclarer {
* 任职受雇从业类型
*/
@Length
(
max
=
2
,
message
=
"任职受雇从业类型不能超过2个字符"
)
@ExcelIgnore
@ExcelAttribute
(
name
=
"任职受雇从业类型"
,
maxLength
=
2
,
readConverterExp
=
"0=雇员,1=其他"
)
@ExcelProperty
(
"任职受雇从业类型"
)
private
String
occupationType
;
/**
* 任职受雇从业日期
*/
@ExcelAttribute
(
name
=
"任职受雇从业日期"
,
maxLength
=
20
)
@Length
(
max
=
20
,
message
=
"任职受雇从业日期不能超过20个字符"
)
@Excel
Property
(
"任职受雇从业日期"
)
@Excel
Ignore
private
String
occupationMonth
;
/**
* 本月是否申报 0 是 1 否
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TMinSalaryController.java
View file @
35848004
...
...
@@ -87,8 +87,8 @@ public class TMinSalaryController {
@SysLog
(
"修改各地市最低工资标准"
)
@PutMapping
@PreAuthorize
(
"@pms.hasPermission('wxhr:tminsalary_edit')"
)
public
R
update
(
@RequestBody
TMinSalary
tMinSalary
)
{
return
new
R
<>(
tMinSalaryService
.
updateById
(
tMinSalary
)
);
public
R
<
Boolean
>
update
(
@RequestBody
TMinSalary
tMinSalary
)
{
return
tMinSalaryService
.
updateByIdDIy
(
tMinSalary
);
}
/**
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsDeclarerMapper.java
View file @
35848004
...
...
@@ -46,5 +46,5 @@ public interface TStatisticsDeclarerMapper extends BaseMapper<TStatisticsDeclare
* @Description: 统计
* @return:
**/
List
<
TStatisticsDeclarer
>
doStatisticsTaxDeclarer
(
@Param
(
"nowMonth"
)
String
nowMonth
,
@Param
(
"last
Year
"
)
String
lastYear
);
List
<
TStatisticsDeclarer
>
doStatisticsTaxDeclarer
(
@Param
(
"nowMonth"
)
String
nowMonth
,
@Param
(
"last
Month
"
)
String
lastYear
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TMinSalaryService.java
View file @
35848004
...
...
@@ -24,4 +24,6 @@ public interface TMinSalaryService extends IService<TMinSalary> {
R
<
Boolean
>
saveDiy
(
TMinSalary
tMinSalary
);
R
<
Boolean
>
updateByIdDIy
(
TMinSalary
tMinSalary
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java
View file @
35848004
...
...
@@ -66,4 +66,38 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
return
R
.
ok
(
true
,
CommonConstants
.
SAVE_SUCCESS
);
}
@Override
public
R
<
Boolean
>
updateByIdDIy
(
TMinSalary
tMinSalary
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
null
==
user
||
null
==
user
.
getId
())
{
return
R
.
failed
(
"获取登录用户信息失败!"
);
}
TMinSalary
entity
=
baseMapper
.
selectById
(
tMinSalary
.
getId
());
if
(
Common
.
isNotNull
(
entity
)){
LambdaQueryWrapper
<
TMinSalary
>
query
=
new
LambdaQueryWrapper
<>();
if
(
Common
.
isNotNull
(
tMinSalary
.
getProvince
())){
query
.
eq
(
TMinSalary:
:
getProvince
,
tMinSalary
.
getProvince
());
}
if
(
Common
.
isNotNull
(
tMinSalary
.
getCity
())){
query
.
eq
(
TMinSalary:
:
getCity
,
tMinSalary
.
getCity
());
}
if
(
Common
.
isNotNull
(
tMinSalary
.
getTown
())){
query
.
eq
(
TMinSalary:
:
getTown
,
tMinSalary
.
getTown
());
}
if
(
Common
.
isEmpty
(
tMinSalary
.
getTown
())){
query
.
isNull
(
TMinSalary:
:
getTown
);
}
query
.
ne
(
TMinSalary:
:
getId
,
tMinSalary
.
getId
());
query
.
eq
(
TMinSalary:
:
getStatus
,
CommonConstants
.
ONE_INT
);
long
res
=
baseMapper
.
selectCount
(
query
);
if
(
res
>
CommonConstants
.
ZERO_INT
){
return
R
.
failed
(
"已存在对应区域在用的配置信息"
);
}
baseMapper
.
updateById
(
entity
);
return
R
.
ok
(
true
,
CommonConstants
.
UPDATE_SUCCESS
);
}
else
{
return
R
.
failed
(
false
,
CommonConstants
.
SAVE_FAILED
);
}
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
View file @
35848004
...
...
@@ -201,7 +201,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
dept
=
sdr
.
getData
();
}
if
(
dept
==
null
||
dept
.
getId
()
=
=
null
)
{
if
(
dept
!=
null
&&
dept
.
getId
()
!
=
null
)
{
invoiceTitle
=
dept
.
getBusinessSubjectName
();
}
...
...
@@ -273,10 +273,11 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
finalSalaryNoSalary
=
calculationSalary
(
annousTax
,
infoVo
.
getAnnualBonus
());
//年终奖合并扣税
if
(
isSend
)
{
wSalary
=
infoVo
.
getAnnualBonus
();
finalSalaryWithSalary
=
finalSalaryNoSalary
;
}
else
{
finalSalaryWithSalary
=
calculationSalary
(
annousTax
,
BigDecimalUtils
.
safeAdd
(
infoVo
.
getAnnualBonus
(),
infoVo
.
getAnnualTSalary
())
);
wSalary
=
BigDecimalUtils
.
safeAdd
(
infoVo
.
getAnnualBonus
(),
infoVo
.
getAnnualTSalary
());
finalSalaryWithSalary
=
calculationSalary
(
annousTax
,
wSalary
);
}
if
(
BigDecimalUtils
.
safeSubtract
(
BigDecimalUtils
.
safeAdd
(
ySalary
,
wSalary
),
sumDeductSalary
).
...
...
@@ -471,8 +472,12 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
zySalary
.
add
(
BigDecimalUtils
.
safeAdd
(
res
,
anRes
));
map
.
put
(
BigDecimalUtils
.
safeAdd
(
res
,
anRes
).
toString
(),
i
);
}
BigDecimal
salary
=
BigDecimal
.
ZERO
;
if
(
Common
.
isNotNull
(
zySalary
))
{
salary
=
Collections
.
min
(
zySalary
);
}
jsonObject
.
put
(
"anRes"
,
map
);
jsonObject
.
put
(
"zySalary"
,
Collections
.
max
(
zySalary
)
);
jsonObject
.
put
(
"zySalary"
,
salary
);
return
jsonObject
;
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsDeclarerServiceImpl.java
View file @
35848004
...
...
@@ -173,8 +173,7 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
return
R
.
failed
(
"上月数据已生成,不可重复生成!"
);
}
else
{
String
lastMonth
=
DateUtil
.
addMonth
(-
1
);
//上月
String
lastYear
=
lastMonth
.
substring
(
0
,
4
);
List
<
TStatisticsDeclarer
>
stdvoList
=
baseMapper
.
doStatisticsTaxDeclarer
(
nowMonth
,
lastYear
);
List
<
TStatisticsDeclarer
>
stdvoList
=
baseMapper
.
doStatisticsTaxDeclarer
(
nowMonth
,
lastMonth
);
for
(
TStatisticsDeclarer
declarer
:
stdvoList
)
{
this
.
save
(
declarer
);
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsDeclarerMapper.xml
View file @
35848004
...
...
@@ -95,12 +95,15 @@
<!--统计-->
<select
id=
"doStatisticsTaxDeclarer"
resultMap=
"tStatisticsDeclarerMap"
>
select
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,a.INVOICE_TITLE DECLARE_UNIT,
if(a.FORM_TYPE=0,'0',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE
from t_salary_account a
left join t_salary_employee b on b.id = a.EMP_ID
where a.DELETE_FLAG = '0' and a.SETTLEMENT_MONTH like '${lastYear}%'
GROUP BY a.EMP_IDCARD,OCCUPATION_TYPE,DECLARE_UNIT,a.SETTLEMENT_MONTH
SELECT
#{nowMonth} DECLARE_MONTH,c.EMP_NAME,c.EMP_IDCARD,c.EMP_PHONE,c.INVOICE_TITLE DECLARE_UNIT,
if(c.FORM_TYPE=0,'0',if(c.FORM_TYPE=3 or c.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE FROM
(SELECT s.* FROM t_salary_account s,
(SELECT a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,a.INVOICE_TITLE,a.FORM_TYPE,MAX(CREATE_TIME) max_day,a.SETTLEMENT_MONTH
FROM t_salary_account a WHERE a.DELETE_FLAG = '0' AND a.SETTLEMENT_MONTH = #{lastYear}
GROUP BY a.EMP_IDCARD,a.INVOICE_TITLE,a.FORM_TYPE,a.SETTLEMENT_MONTH) b
WHERE s.DELETE_FLAG = '0' AND b.max_day = s.CREATE_TIME
AND s.EMP_IDCARD = b.EMP_IDCARD AND s.INVOICE_TITLE = b.INVOICE_TITLE
AND s.SETTLEMENT_MONTH = b.SETTLEMENT_MONTH AND s.FORM_TYPE = b.FORM_TYPE ) c
</select>
</mapper>
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
35848004
...
...
@@ -1345,12 +1345,10 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
+
CommonConstants
.
DOWN_LINE_STRING
+
infoVo
.
getProvidentCreateMonth
().
trim
()
+
CommonConstants
.
DOWN_LINE_STRING
+
Math
.
round
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
getProvidentSum
()).
doubleValue
()
*
100
)
/
100.0
);
+
Math
.
round
(
BigDecimalUtils
.
safeAdd
(
infoVo
.
get
Unit
ProvidentSum
()).
doubleValue
()
*
100
)
/
100.0
);
}
//存在公积金缴费数据
if
(
null
!=
paymentInfo
&&
((
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getProvidentSum
()).
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
||
((
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getSocialSum
()).
compareTo
(
BigDecimal
.
ZERO
)
==
0
)
&&
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getProvidentSum
()).
compareTo
(
BigDecimal
.
ZERO
)
==
0
)))
{
if
(
null
!=
paymentInfo
&&
BigDecimalUtils
.
isNullToZero
(
paymentInfo
.
getUnitProvidentSum
()).
compareTo
(
BigDecimal
.
ZERO
)
!=
0
)
{
//允许覆盖,但已核准表或工资结算或已锁定不允许覆盖
errorMessageList
.
add
(
new
ErrorMessage
(
infoVo
.
getRowIndex
(),
"已存在对应员工身份证"
+
...
...
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