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
12ee9a5d
Commit
12ee9a5d
authored
May 21, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.11- HCM工资相关
parent
a295b6d9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
3 deletions
+32
-3
HcmSalarySearchVo.java
.../yifu/cloud/plus/v1/yifu/salary/vo/HcmSalarySearchVo.java
+23
-0
SalaryUploadController.java
...lus/v1/yifu/salary/controller/SalaryUploadController.java
+7
-1
TSalaryAccountItemMapper.xml
...iz/src/main/resources/mapper/TSalaryAccountItemMapper.xml
+2
-2
No files found.
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/HcmSalarySearchVo.java
0 → 100644
View file @
12ee9a5d
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
vo
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
/**
* Hcm查询工资表的入参
*
* @author hgw
* @date 2019-07-30 15:00:05
*/
@Data
public
class
HcmSalarySearchVo
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@Schema
(
description
=
"身份证集合"
)
List
<
String
>
idCardList
;
@Schema
(
description
=
"工资月份"
)
String
salaryMonth
;
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/SalaryUploadController.java
View file @
12ee9a5d
...
@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...
@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAccount
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.SalaryUploadService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.SalaryUploadService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.HcmSalarySearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadParamVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadParamVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryDetailVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryDetailVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
...
@@ -61,7 +62,12 @@ public class SalaryUploadController {
...
@@ -61,7 +62,12 @@ public class SalaryUploadController {
**/
**/
@Operation
(
description
=
"HCM查询工资"
)
@Operation
(
description
=
"HCM查询工资"
)
@PostMapping
(
"/getHcmSalaryByIdCardListAndMonth"
)
@PostMapping
(
"/getHcmSalaryByIdCardListAndMonth"
)
public
R
<
List
<
TSalaryAccount
>>
getSalaryByIdCardList
(
@RequestBody
List
<
String
>
idCardList
,
@RequestParam
String
salaryMonth
)
{
public
R
<
List
<
TSalaryAccount
>>
getSalaryByIdCardList
(
@RequestBody
HcmSalarySearchVo
vo
)
{
List
<
String
>
idCardList
=
vo
.
getIdCardList
();
String
salaryMonth
=
vo
.
getSalaryMonth
();
if
(
Common
.
isEmpty
(
salaryMonth
))
{
return
R
.
failed
(
"工资月不可为空"
);
}
if
(
Common
.
isEmpty
(
idCardList
)
||
idCardList
.
isEmpty
())
{
if
(
Common
.
isEmpty
(
idCardList
)
||
idCardList
.
isEmpty
())
{
return
R
.
failed
(
"身份证不可为空"
);
return
R
.
failed
(
"身份证不可为空"
);
}
else
if
(
idCardList
.
size
()
>
3000
)
{
}
else
if
(
idCardList
.
size
()
>
3000
)
{
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountItemMapper.xml
View file @
12ee9a5d
...
@@ -480,8 +480,8 @@
...
@@ -480,8 +480,8 @@
<select
id=
"getSalaryItemVoListByHcm"
resultMap=
"tSalaryAccountItemMap"
>
<select
id=
"getSalaryItemVoListByHcm"
resultMap=
"tSalaryAccountItemMap"
>
SELECT
SELECT
<include
refid=
"Base_Column_List"
/>
<include
refid=
"Base_Column_List"
/>
FROM t_salary_account_item
i
FROM t_salary_account_item
a
where
i
.SALARY_ACCOUNT_ID in
where
a
.SALARY_ACCOUNT_ID in
<foreach
item=
"item"
index=
"index"
collection=
"accIdList"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"item"
index=
"index"
collection=
"accIdList"
open=
"("
separator=
","
close=
")"
>
#{item}
#{item}
</foreach>
</foreach>
...
...
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