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
e7b475a9
Commit
e7b475a9
authored
Aug 24, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
专项扣除
parent
4a0c14f5
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
260 additions
and
18 deletions
+260
-18
EkpSalaryParam.java
...va/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java
+243
-1
TSalaryStandardExportVo.java
...cloud/plus/v1/yifu/salary/vo/TSalaryStandardExportVo.java
+3
-3
THaveSalaryNosocialController.java
...yifu/salary/controller/THaveSalaryNosocialController.java
+6
-5
THaveSalaryNosocialMapper.xml
...z/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
+1
-1
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+5
-5
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+2
-3
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java
View file @
e7b475a9
...
...
@@ -2,6 +2,8 @@ package com.yifu.cloud.plus.v1.yifu.ekp.vo;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author fxj
* @Date 2022/8/22
...
...
@@ -9,5 +11,245 @@ import lombok.Data;
* @Version 1.0
*/
@Data
public
class
EkpSalaryParam
{
public
class
EkpSalaryParam
implements
Serializable
{
/**
* ID
**/
private
String
fd_id
;
/**
* 项目编码
**/
private
String
fd_3adfedf98ccba2
;
/**
* 项目名称
**/
private
String
fd_3adfedf9d2bf1c
;
/**
* 单号
**/
private
String
fd_3adfedfa4410aa
;
/**
* 客户编码
**/
private
String
fd_3adfedfacd65d6
;
/**
* 客户名称
**/
private
String
fd_3adfedfb174068
;
/**
* 姓名
**/
private
String
fd_3adfedfb5a68a2
;
/**
* 身份证号
**/
private
String
fd_3adfedfb8f76d4
;
/**
* 手机号
**/
private
String
fd_3adfedfbd23ab8
;
/**
* 银行卡号
**/
private
String
fd_3adfedfcb17f1e
;
/**
* 开户行
**/
private
String
fd_3adfedfc453cc4
;
/**
* 工资月份
**/
private
String
fd_3adfee063acff0
;
/**
* 结算月份
**/
private
String
fd_3adfee0690737c
;
/**
* 是否薪资扣税
**/
private
String
fd_3adfee01668666
;
/**
* 社保优先级
**/
private
String
fd_3adfedfed8bb28
;
/**
* 公积金优先级
**/
private
String
fd_3adfedff3a7430
;
/**
* 是否自有员工
**/
private
String
fd_3adfee0009d070
;
/**
* 年终奖扣税方案
**/
private
String
fd_3adfee01dea2fa
;
/**
* 应发工资
**/
private
String
fd_3adfee12cb8840
;
/**
* 个人代扣
**/
private
String
fd_3adfee1374ed7a
;
/**
* 单位社保
**/
private
String
fd_3adfee1e2b2f78
;
/**
* 个人社保
**/
private
String
fd_3adfee1e88723e
;
/**
* 单位公积金
**/
private
String
fd_3adfee1ee24680
;
/**
* 个人公积金
**/
private
String
fd_3adfee1f32fa24
;
/**
* 个税
**/
private
String
fd_3adfee1f901c46
;
/**
* 企业年金单位
**/
private
String
fd_3adfee1ff1ca6a
;
/**
* 企业年金个人
**/
private
String
fd_3adfee203f86b2
;
/**
* 突发合计
**/
private
String
fd_3adfee20fe5ba4
;
/**
* 应收
**/
private
String
fd_3adfee21802434
;
/**
* 收入结算状态
**/
private
String
fd_3adfee4ba5ad36
;
/**
* 收款状态
**/
private
String
fd_3adfee4c0c59ee
;
/**
* 收入结算单号
**/
private
String
fd_3adfee5dd14866
;
/**
* 收款单号
**/
private
String
fd_3adfee5e3d1638
;
/**
* 代扣费用应支出
**/
private
String
fd_3adfeeb34ea0ea
;
/**
* 代扣费用结算状态
**/
private
String
fd_3adfeededfb5a6
;
/**
* 代扣费用付款状态
**/
private
String
fd_3adfeed3a20598
;
/**
* 代扣费用结算单号
**/
private
String
fd_3aea30866d0c30
;
/**
* 代扣费用付款单号
**/
private
String
fd_3aea309696d32e
;
/**
* 个税应支出
**/
private
String
fd_3adfeec6db8766
;
/**
* 个税结算状态
**/
private
String
fd_3adfeef8ef38fc
;
/**
* 个税付款状态
**/
private
String
fd_3adfeedd08222c
;
/**
* 个税支出结算单号
**/
private
String
fd_3aeadede4cea84
;
/**
* 个税支出付款单号
**/
private
String
fd_3aeadee1cf1266
;
/**
* 突发合计应支出
**/
private
String
fd_3adfeec730ec44
;
/**
* 工资突发结算状态
**/
private
String
fd_3adfeef9440ab2
;
/**
* 突发合计付款状态
**/
private
String
fd_3adfeedd5f3cb2
;
/**
* 突发结算单号
**/
private
String
fd_3aeadf17522642
;
/**
* 突发付款单号
**/
private
String
fd_3aeadf17b7d03a
;
/**
* 企业年金单位应支出
**/
private
String
fd_3adfeec782070a
;
/**
* 企业年金单位应结算状态
**/
private
String
fd_3adfeef9b9fb3e
;
/**
* 企业年金单位付款状态
**/
private
String
fd_3adfeeddacf6d4
;
/**
* 年金单位结算单号
**/
private
String
fd_3aeadf182ef6a2
;
/**
* 年金单位付款单号
**/
private
String
fd_3aeadf1892fdb2
;
/**
* 企业年金个人应支出
**/
private
String
fd_3adfeec7ccdd1c
;
/**
* 企业年金个人结算状态
**/
private
String
fd_3adfeefa1eba32
;
/**
* 企业年金个人付款状态
**/
private
String
fd_3adfeede08d430
;
/**
* 年金个人结算单号
**/
private
String
fd_3aeadf191c62a0
;
/**
* 年金个人付款单号
**/
private
String
fd_3aeadf1992544c
;
/**
* 暂停发
**/
private
String
fd_3af9d49d165e90
;
/**
* 税务主体
**/
private
String
fd_3afab1895feea2
;
}
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TSalaryStandardExportVo.java
View file @
e7b475a9
...
...
@@ -25,10 +25,10 @@ public class TSalaryStandardExportVo implements Serializable {
/**
* 状态(0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8:结算单调整待审核 9: 结算单调整待打印)
*/
@ExcelAttribute
(
name
=
"状态
(0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8:结算单调整待审核 9: 结算单调整待打印)
"
)
@ExcelAttribute
(
name
=
"状态
"
,
isDataId
=
true
,
readConverterExp
=
"0=待提交,1=待审核,2=待推送,3=已推送待发放,4=已发放,5=审核不通过,6=确认不通过,7=财务退回,8=结算单调整待审核,9=结算单调整待打印
"
)
@NotBlank
(
message
=
"状态(0待提交1待审核2:待推送3已推送待发放4已发放5审核不通过6确认不通过7财务退回8:结算单调整待审核 9: 结算单调整待打印)不能为空"
)
@ExcelProperty
(
"状态
)
"
)
private
Integer
status
;
@ExcelProperty
(
"状态"
)
private
String
status
;
/**
* 推送月份(YYYYMM)
*/
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/THaveSalaryNosocialController.java
View file @
e7b475a9
...
...
@@ -21,11 +21,12 @@ import javax.validation.Valid;
/**
* 有资没有社保(首页提醒定时任务)
*
* @author wangan
* @date 2019-11-26 09:34:58
*/
* @Author fxj
* @Description 有资没有社保(首页提醒定时任务)
* @Date 17:02 2022/8/23
* @Param
* @return
**/
@RestController
@AllArgsConstructor
@RequestMapping
(
"/thavesalarynosocial"
)
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml
View file @
e7b475a9
...
...
@@ -238,7 +238,7 @@
#{param}
</foreach>
</if>
<if
test=
"settleDomain
Vo
s.size() == 0"
>
<if
test=
"settleDomain
Id
s.size() == 0"
>
and 1=2
</if>
</if>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
e7b475a9
...
...
@@ -303,13 +303,13 @@
<where>
a.DELETE_FLAG = 0
<include
refid=
"where_export"
/>
<if
test=
"searchVo != null"
>
<if
test=
"searchVo.limitStart != null"
>
limit #{searchVo.limitStart},#{searchVo.limitEnd}
</if>
</if>
</where>
ORDER BY a.CREATE_TIME desc
<if
test=
"searchVo != null"
>
<if
test=
"searchVo.limitStart != null"
>
limit #{searchVo.limitStart},#{searchVo.limitEnd}
</if>
</if>
</select>
<!--tSalaryStandard简单分页查询-->
<select
id=
"getSalaryStandardExportCount"
resultType=
"java.lang.Integer"
>
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
e7b475a9
...
...
@@ -844,7 +844,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
* @return
**/
private
Date
getFirstBuyMonthSocial
(
TSocialInfo
social
)
{
if
(
Common
.
isEmpty
(
social
.
getSocialStartDate
())){
if
(
Common
.
isEmpty
(
social
)
||
Common
.
isEmpty
(
social
.
getSocialStartDate
())){
return
null
;
}
if
(
Common
.
isNotNull
(
social
.
getPensionStart
())
&&
social
.
getPensionStart
().
after
(
social
.
getSocialStartDate
())){
...
...
@@ -2018,8 +2018,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
if
((
Common
.
isEmpty
(
empVo
)
||
Common
.
isEmpty
(
empVo
.
getContractStart
()))
&&
Common
.
isNotNull
(
excel
.
getContractName
())
&&
(
Common
.
isEmpty
(
excel
.
getContractSubName
())
||
Common
.
isEmpty
(
excel
.
getContractType
())
Common
.
isEmpty
(
excel
.
getContractType
())
||
Common
.
isEmpty
(
excel
.
getContractStart
())
||
Common
.
isEmpty
(
excel
.
getContractEnd
())
))
{
...
...
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