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
c8244731
Commit
c8244731
authored
Dec 12, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
ffc27e4c
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
73 additions
and
55 deletions
+73
-55
TSettleDomainController.java
.../v1/yifu/archives/controller/TSettleDomainController.java
+5
-1
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+66
-54
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java
View file @
c8244731
...
...
@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.archives.service.TDepartSettlementInfoService
import
com.yifu.cloud.plus.v1.yifu.archives.service.TSettleDomainService
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
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.security.annotation.Inner
;
...
...
@@ -42,6 +43,7 @@ import java.io.UnsupportedEncodingException;
import
java.net.URLDecoder
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
...
...
@@ -181,6 +183,9 @@ public class TSettleDomainController {
List
<
TSettleDomainSelectVo
>
list
=
tSettleDomainService
.
selectAllSettleDomainSelectVos
();
TSettleDomainListVo
listVo
=
new
TSettleDomainListVo
();
listVo
.
setListSelectVO
(
list
);
if
(
Common
.
isNotNull
(
list
)){
listVo
.
setMapSlectVo
(
list
.
stream
().
collect
(
Collectors
.
toMap
(
TSettleDomain:
:
getDepartNo
,
k
->
k
)));
}
return
listVo
;
}
...
...
@@ -318,5 +323,4 @@ public class TSettleDomainController {
public
R
<
IPage
<
IdNameNoVo
>>
getUnitPage
(
Page
<
IdNameNoVo
>
page
,
IdNameNoVo
idNameNo
)
{
return
R
.
ok
(
tSettleDomainService
.
getUnitPage
(
page
,
idNameNo
));
}
}
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
c8244731
...
...
@@ -505,4 +505,6 @@ public interface CommonConstants {
// 权限使用的
public
static
final
String
A_DEPT_ID
=
"a.dept_id"
;
public
static
final
String
A_CREATE_BY
=
"a.CREATE_BY"
;
String
SETTLE_DOMAIN_GET_ERROR
=
"获取结算主体信息失败!"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
c8244731
This diff is collapsed.
Click to expand it.
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