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
1a9dea92
Commit
1a9dea92
authored
Jul 19, 2023
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
退表编码空BUG处理 & 社保审核 社保公积金更新SQL 优化
parent
374a30a6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
71 additions
and
53 deletions
+71
-53
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+55
-52
TProvidentFundMapper.java
...loud/plus/v1/yifu/social/mapper/TProvidentFundMapper.java
+2
-0
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-1
TProvidentFundMapper.xml
...al-biz/src/main/resources/mapper/TProvidentFundMapper.xml
+13
-0
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
1a9dea92
...
...
@@ -837,62 +837,65 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
**/
public
R
<
String
>
backSalaryByApplyNo
(
String
applyNo
)
{
List
<
TSalaryStandard
>
salaryList
=
this
.
list
(
Wrappers
.<
TSalaryStandard
>
query
().
lambda
().
eq
(
TSalaryStandard:
:
getApplyNo
,
applyNo
));
if
(
salaryList
!=
null
&&
!
salaryList
.
isEmpty
())
{
TSalaryStandard
ss
=
salaryList
.
get
(
0
);
if
(
ss
.
getStatus
()
!=
SalaryConstants
.
STATUS
[
6
])
{
// 通知EKP
EkpSalaryBackParam
param
=
new
EkpSalaryBackParam
();
param
.
setFd_3b3c293745e7b4
(
ss
.
getDeptName
());
param
.
setFd_3b3c2935c13056
(
ss
.
getDeptNo
());
param
.
setFd_3b3c293811c0ee
(
ss
.
getApplyNo
());
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
)
{
param
.
setFd_3b422d73d73e02
(
user
.
getUsername
());
}
else
{
param
.
setFd_3b422d73d73e02
(
""
);
}
String
sendBack
=
ekpSalaryUtil
.
backStandardToEKP
(
param
);
if
(
Common
.
isEmpty
(
sendBack
)
||
sendBack
.
length
()
!=
32
)
{
sendBack
=
ekpSalaryUtil
.
backStandardToEKP
(
param
);
}
if
(
Common
.
isNotNull
(
sendBack
)
&&
sendBack
.
length
()
==
32
)
{
// 更新薪资为确认不通过
ss
.
setStatus
(
SalaryConstants
.
STATUS
[
6
]);
ss
.
setSendMonth
(
null
);
ss
.
setSendTime
(
null
);
ss
.
setBackTime
(
new
Date
());
ss
.
setBackEkpId
(
sendBack
);
this
.
updateById
(
ss
);
// 更新报账表
salaryAccountService
.
backSalaryBySalaryId
(
ss
.
getId
());
TIncome
income
=
new
TIncome
();
income
.
setApplyNo
(
applyNo
);
// 删除收入对应编号的明细
HttpDaprUtil
.
invokeMethodPost
(
socialProperties
.
getAppUrl
(),
socialProperties
.
getAppId
()
,
"/tincome/inner/deleteIncomeAndDetailByApplyNo"
,
income
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
// 添加流程进展明细
if
(
Common
.
isNotNull
(
applyNo
)){
List
<
TSalaryStandard
>
salaryList
=
this
.
list
(
Wrappers
.<
TSalaryStandard
>
query
().
lambda
().
eq
(
TSalaryStandard:
:
getApplyNo
,
applyNo
));
if
(
salaryList
!=
null
&&
!
salaryList
.
isEmpty
())
{
TSalaryStandard
ss
=
salaryList
.
get
(
0
);
if
(
ss
.
getStatus
()
!=
SalaryConstants
.
STATUS
[
6
])
{
// 通知EKP
EkpSalaryBackParam
param
=
new
EkpSalaryBackParam
();
param
.
setFd_3b3c293745e7b4
(
ss
.
getDeptName
());
param
.
setFd_3b3c2935c13056
(
ss
.
getDeptNo
());
param
.
setFd_3b3c293811c0ee
(
ss
.
getApplyNo
());
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
user
!=
null
)
{
ss
.
setRemark
(
" "
);
this
.
saveRecordLog
(
ss
,
user
,
CommonConstants
.
ZERO_STRING
,
"从EKP退表"
);
param
.
setFd_3b422d73d73e02
(
user
.
getUsername
());
}
else
{
param
.
setFd_3b422d73d73e02
(
""
);
}
String
sendBack
=
ekpSalaryUtil
.
backStandardToEKP
(
param
);
if
(
Common
.
isEmpty
(
sendBack
)
||
sendBack
.
length
()
!=
32
)
{
sendBack
=
ekpSalaryUtil
.
backStandardToEKP
(
param
);
}
if
(
Common
.
isNotNull
(
sendBack
)
&&
sendBack
.
length
()
==
32
)
{
// 更新薪资为确认不通过
ss
.
setStatus
(
SalaryConstants
.
STATUS
[
6
]);
ss
.
setSendMonth
(
null
);
ss
.
setSendTime
(
null
);
ss
.
setBackTime
(
new
Date
());
ss
.
setBackEkpId
(
sendBack
);
this
.
updateById
(
ss
);
// 更新报账表
salaryAccountService
.
backSalaryBySalaryId
(
ss
.
getId
());
TIncome
income
=
new
TIncome
();
income
.
setApplyNo
(
applyNo
);
// 删除收入对应编号的明细
HttpDaprUtil
.
invokeMethodPost
(
socialProperties
.
getAppUrl
(),
socialProperties
.
getAppId
()
,
"/tincome/inner/deleteIncomeAndDetailByApplyNo"
,
income
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
// 添加流程进展明细
if
(
user
!=
null
)
{
ss
.
setRemark
(
" "
);
this
.
saveRecordLog
(
ss
,
user
,
CommonConstants
.
ZERO_STRING
,
"从EKP退表"
);
}
return
R
.
ok
();
}
else
{
TSendEkpError
error
=
new
TSendEkpError
();
error
.
setCreateTime
(
new
Date
());
error
.
setCreateDay
(
DateUtil
.
getThisDay
());
error
.
setType
(
CommonConstants
.
SEVEN_STRING
);
error
.
setCreateUserName
(
ss
.
getCreateName
());
error
.
setLinkId
(
ss
.
getId
());
error
.
setTitle
(
sendBack
==
null
?
SalaryConstants
.
EKP_NO_RETURN
:
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
HttpDaprUtil
.
invokeMethodPost
(
socialProperties
.
getAppUrl
(),
socialProperties
.
getAppId
()
,
"/tsendekperror/inner/saveError"
,
error
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
return
R
.
failed
(
"连续两次请求EKP,均未接收到EKP删除成功的返回信息,不予退回"
);
}
return
R
.
ok
();
}
else
{
TSendEkpError
error
=
new
TSendEkpError
();
error
.
setCreateTime
(
new
Date
());
error
.
setCreateDay
(
DateUtil
.
getThisDay
());
error
.
setType
(
CommonConstants
.
SEVEN_STRING
);
error
.
setCreateUserName
(
ss
.
getCreateName
());
error
.
setLinkId
(
ss
.
getId
());
error
.
setTitle
(
sendBack
==
null
?
SalaryConstants
.
EKP_NO_RETURN
:
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
HttpDaprUtil
.
invokeMethodPost
(
socialProperties
.
getAppUrl
(),
socialProperties
.
getAppId
()
,
"/tsendekperror/inner/saveError"
,
error
,
Boolean
.
class
,
SecurityConstants
.
FROM_IN
);
return
R
.
failed
(
"连续两次请求EKP,均未接收到EKP删除成功的返回信息,不予退回"
);
return
R
.
failed
(
"工资表已退回,请不要重复操作"
);
}
}
else
{
return
R
.
failed
(
"工资表已退回,请不要重复操作"
);
}
}
return
R
.
failed
(
"未找到工资表"
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TProvidentFundMapper.java
View file @
1a9dea92
...
...
@@ -39,4 +39,6 @@ public interface TProvidentFundMapper extends BaseMapper<TProvidentFund> {
IPage
<
TProvidentFund
>
getTProvidentFundPage
(
Page
<
TProvidentFund
>
page
,
@Param
(
"tProvidentFund"
)
TProvidentFund
tProvidentFund
);
int
updateFundInfoById
(
@Param
(
"tProvidentFund"
)
TProvidentFund
providentFund
);
int
updateByIdOfAudit
(
@Param
(
"tProvidentFund"
)
TProvidentFund
providentFund
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
1a9dea92
...
...
@@ -3406,7 +3406,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf
.
setFundReduceDate
(
null
);
}
}
fundMapper
.
updateById
(
providentFund
);
fundMapper
.
updateById
OfAudit
(
providentFund
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TProvidentFundMapper.xml
View file @
1a9dea92
...
...
@@ -306,4 +306,17 @@
</trim>
WHERE id=#{tProvidentFund.id}
</update>
<update
id=
"updateByIdOfAudit"
>
update t_provident_fund
<trim
prefix=
"set"
suffixOverrides=
","
>
<if
test=
"tProvidentFund.reduceCan != null"
>
REDUCE_CAN=#{tProvidentFund.reduceCan},
</if>
<if
test=
"tProvidentFund.auditTime != null"
>
AUDIT_TIME=#{tProvidentFund.auditTime},
</if>
<if
test=
"tProvidentFund.auditUser != null"
>
AUDIT_USER=#{tProvidentFund.auditUser},
</if>
<if
test=
"tProvidentFund.auditUserName != null"
>
AUDIT_USER_NAME=#{tProvidentFund.auditUserName},
</if>
<if
test=
"tProvidentFund.auditStatus != null"
>
AUDIT_STATUS=#{tProvidentFund.auditStatus},
</if>
<if
test=
"tProvidentFund.deleteFlag != null"
>
DELETE_FLAG=#{tProvidentFund.deleteFlag},
</if>
</trim>
WHERE id=#{tProvidentFund.id}
</update>
</mapper>
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