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
993fd2d8
You need to sign in or sign up before continuing.
Commit
993fd2d8
authored
Aug 15, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
deptVo
parent
0ee61b86
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
4 deletions
+14
-4
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+1
-1
SalaryUploadController.java
...lus/v1/yifu/salary/controller/SalaryUploadController.java
+8
-0
TSalaryAttaController.java
...plus/v1/yifu/salary/controller/TSalaryAttaController.java
+2
-2
SalaryUploadServiceImpl.java
.../v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
+3
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
993fd2d8
...
@@ -216,7 +216,7 @@ public class TSettleDomainController {
...
@@ -216,7 +216,7 @@ public class TSettleDomainController {
**/
**/
@Inner
@Inner
@PostMapping
(
"/inner/getSettleDomainVoById"
)
@PostMapping
(
"/inner/getSettleDomainVoById"
)
public
TSettleDomainSelectVo
getSettleDomainVoById
(
String
id
)
{
public
TSettleDomainSelectVo
getSettleDomainVoById
(
@RequestParam
String
id
)
{
return
tSettleDomainService
.
getSettleDomainVoById
(
id
);
return
tSettleDomainService
.
getSettleDomainVoById
(
id
);
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/SalaryUploadController.java
View file @
993fd2d8
...
@@ -4,6 +4,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...
@@ -4,6 +4,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.service.SalaryUploadService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.SalaryUploadService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryDetailVo
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.Operation
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
io.swagger.v3.oas.annotations.tags.Tag
;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
...
@@ -59,4 +60,11 @@ public class SalaryUploadController {
...
@@ -59,4 +60,11 @@ public class SalaryUploadController {
return
salaryUploadService
.
saveAndSubmit
(
savList
);
return
salaryUploadService
.
saveAndSubmit
(
savList
);
}
}
@Operation
(
description
=
"打开结算单"
)
@SysLog
(
"打开结算单"
)
@PostMapping
(
"openBill"
)
public
R
<
TSalaryDetailVo
>
openBill
(
@RequestParam
String
salaryFormId
)
{
return
salaryUploadService
.
getBill
(
salaryFormId
);
}
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAttaController.java
View file @
993fd2d8
...
@@ -71,7 +71,7 @@ public class TSalaryAttaController {
...
@@ -71,7 +71,7 @@ public class TSalaryAttaController {
* @Date: 2021-12-8 15:36:58
* @Date: 2021-12-8 15:36:58
* @return: com.yifu.cloud.v1.common.core.util.R<java.util.List < com.yifu.cloud.v1.hrms.api.entity.TSalaryAtta>>
* @return: com.yifu.cloud.v1.common.core.util.R<java.util.List < com.yifu.cloud.v1.hrms.api.entity.TSalaryAtta>>
**/
**/
@Schema
(
description
=
"获取list(linkId, linkType链接类型:0工资;1工程工资;2暂停发;3自定义项暂停发;4打印记录;5核准表打印记录6:非扣税 7发放失败 8自有员工附件 9财务回执附件 10换人换卡附件;11薪资原表;12劳务费或稿酬已有发薪记录;13薪资特殊值(3500、5000)
)
"
)
@Schema
(
description
=
"获取list(linkId, linkType链接类型:0工资;1工程工资;2暂停发;3自定义项暂停发;4打印记录;5核准表打印记录6:非扣税 7发放失败 8自有员工附件 9财务回执附件 10换人换卡附件;11薪资原表;12劳务费或稿酬已有发薪记录;13薪资特殊值(3500、5000)
;14本月重复金额
"
)
@GetMapping
(
"/getTSalaryAttaListByIdType"
)
@GetMapping
(
"/getTSalaryAttaListByIdType"
)
public
R
<
List
<
TSalaryAtta
>>
getTSalaryAttaListByIdType
(
@RequestParam
String
linkId
,
@RequestParam
Integer
linkType
)
{
public
R
<
List
<
TSalaryAtta
>>
getTSalaryAttaListByIdType
(
@RequestParam
String
linkId
,
@RequestParam
Integer
linkType
)
{
return
new
R
<>(
tSalaryAttaService
.
getAttaListHaveSrc
(
linkId
,
linkType
));
return
new
R
<>(
tSalaryAttaService
.
getAttaListHaveSrc
(
linkId
,
linkType
));
...
@@ -86,7 +86,7 @@ public class TSalaryAttaController {
...
@@ -86,7 +86,7 @@ public class TSalaryAttaController {
* @throws IOException
* @throws IOException
*/
*/
@SysLog
(
"薪资附件上传"
)
@SysLog
(
"薪资附件上传"
)
@Schema
(
description
=
"OSS文件上传接口。linkType类型:0工资;1工程工资;2暂停发;3自定义项暂停发;4薪资打印记录;5核准表打印记录;6:非扣税项;8自有员工附件;9:财务回执附件;10换人换卡附件;11薪资原表"
)
@Schema
(
description
=
"OSS文件上传接口。linkType类型:0工资;1工程工资;2暂停发;3自定义项暂停发;4薪资打印记录;5核准表打印记录;6:非扣税项;8自有员工附件;9:财务回执附件;10换人换卡附件;11薪资原表
;12劳务费或稿酬已有发薪记录;13薪资特殊值(3500、5000);14本月重复金额
"
)
/*@ApiImplicitParams({
/*@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "Form文件上传", required = true, dataType = "__file", paramType = "form"),
@ApiImplicitParam(name = "file", value = "Form文件上传", required = true, dataType = "__file", paramType = "form"),
@ApiImplicitParam(name = "filePath", value = "文件上传路径", dataType = "String", paramType = "form"),
@ApiImplicitParam(name = "filePath", value = "文件上传路径", dataType = "String", paramType = "form"),
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java
View file @
993fd2d8
...
@@ -95,8 +95,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
...
@@ -95,8 +95,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
@Override
@Override
public
R
salaryUpload
(
String
jsonString
,
String
settleDepart
,
String
configId
,
String
salaryType
,
int
repeatFlag
)
{
public
R
salaryUpload
(
String
jsonString
,
String
settleDepart
,
String
configId
,
String
salaryType
,
int
repeatFlag
)
{
if
(
Common
.
isNotNull
(
jsonString
)
&&
Common
.
isNotNull
(
settleDepart
)
&&
Common
.
isNotNull
(
configId
)
&&
Common
.
isNotNull
(
salaryType
))
{
if
(
Common
.
isNotNull
(
jsonString
)
&&
Common
.
isNotNull
(
settleDepart
)
&&
Common
.
isNotNull
(
configId
)
&&
Common
.
isNotNull
(
salaryType
))
{
TSettleDomainSelectVo
deptVo
=
new
TSettleDomainSelectVo
();
deptVo
.
setId
(
settleDepart
);
R
<
TSettleDomainSelectVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
R
<
TSettleDomainSelectVo
>
sdr
=
HttpDaprUtil
.
invokeMethodPost
(
archivesProperties
.
getAppUrl
(),
archivesProperties
.
getAppId
()
,
"/tsettledomain/inner/getSettleDomainVoById"
,
settleDepart
,
TSettleDomainSelectVo
.
class
,
SecurityConstants
.
FROM_IN
);
,
"/tsettledomain/inner/getSettleDomainVoById"
,
deptVo
,
TSettleDomainSelectVo
.
class
,
SecurityConstants
.
FROM_IN
);
// 结算主体
// 结算主体
TSettleDomainSelectVo
dept
=
null
;
TSettleDomainSelectVo
dept
=
null
;
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
if
(
sdr
!=
null
&&
sdr
.
getData
()
!=
null
)
{
...
...
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