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
48cc616a
Commit
48cc616a
authored
Feb 27, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
社保优化修改
parent
880a7968
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
TSalaryAccountController.java
...s/v1/yifu/salary/controller/TSalaryAccountController.java
+7
-7
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java
View file @
48cc616a
...
...
@@ -231,14 +231,14 @@ public class TSalaryAccountController {
@Operation
(
description
=
"获取工资条"
)
@GetMapping
(
"/getEmpAccount"
)
public
R
<
TSalaryDetailVo
>
getEmpAccount
(
String
empIdcard
,
String
settleDepartId
,
String
settlementMonth
,
String
settleDepartNo
,
String
settleDepar
tName
,
String
empName
)
{
,
String
deptNo
,
String
dep
tName
,
String
empName
)
{
TSalaryDetailVo
salaryDetailVo
=
new
TSalaryDetailVo
();
if
(
Common
.
isEmpty
(
empIdcard
)
&&
Common
.
isEmpty
(
settleDepartId
)
&&
Common
.
isEmpty
(
settlementMonth
)
&&
Common
.
isEmpty
(
settleDepartNo
)
&&
Common
.
isEmpty
(
settleDepar
tName
)
&&
Common
.
isEmpty
(
empName
))
{
&&
Common
.
isEmpty
(
deptNo
)
&&
Common
.
isEmpty
(
dep
tName
)
&&
Common
.
isEmpty
(
empName
))
{
return
R
.
failed
(
"请输入查询条件"
);
}
if
(
Common
.
isNotNull
(
settlementMonth
)
&&
Common
.
isEmpty
(
empIdcard
)
&&
Common
.
isEmpty
(
settleDepartId
)
&&
Common
.
isEmpty
(
settleDepartNo
)
&&
Common
.
isEmpty
(
settleDepar
tName
)
&&
Common
.
isEmpty
(
empName
))
{
&&
Common
.
isEmpty
(
deptNo
)
&&
Common
.
isEmpty
(
dep
tName
)
&&
Common
.
isEmpty
(
empName
))
{
return
R
.
failed
(
"结算月需配合其他查询条件一起使用,请输入其他查询条件!"
);
}
//报账表
...
...
@@ -258,11 +258,11 @@ public class TSalaryAccountController {
if
(
Common
.
isNotNull
(
empName
))
{
queryWrapperSa
.
eq
(
"EMP_NAME"
,
empName
);
}
if
(
Common
.
isNotNull
(
settleDepar
tNo
))
{
queryWrapperSa
.
eq
(
"DEPT_NO"
,
settleDepar
tNo
);
if
(
Common
.
isNotNull
(
dep
tNo
))
{
queryWrapperSa
.
eq
(
"DEPT_NO"
,
dep
tNo
);
}
if
(
Common
.
isNotNull
(
settleDepar
tName
))
{
queryWrapperSa
.
like
(
"DEPT_NAME"
,
settleDepar
tName
);
if
(
Common
.
isNotNull
(
dep
tName
))
{
queryWrapperSa
.
like
(
"DEPT_NAME"
,
dep
tName
);
}
if
(
Common
.
isNotNull
(
settlementMonth
)
&&
settlementMonth
.
length
()
<
6
)
{
queryWrapperSa
.
like
(
"SETTLEMENT_MONTH"
,
settlementMonth
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
48cc616a
...
...
@@ -785,7 +785,7 @@
s.SOCIAL_START_DATE,
a.SOCIAL_REDUCE_DATE,
s.RECORD_BASE,
s.HANDLE_USER_NAME,
s.HANDLE_USER_NAME
as HANDLE_USER
,
s.HANDLE_TIME,
s.UNIT_PENSION_CARDINAL,
s.UNIT_MEDICAL_CARDINAL,
...
...
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