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
bff41acc
Commit
bff41acc
authored
Jan 30, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化-fxj
parent
3557078b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
16 deletions
+3
-16
SysBaseSetInfoController.java
...s/v1/yifu/social/controller/SysBaseSetInfoController.java
+3
-16
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/SysBaseSetInfoController.java
View file @
bff41acc
...
@@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.*;
...
@@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.*;
import
org.springframework.web.multipart.MultipartFile
;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -206,23 +205,11 @@ public class SysBaseSetInfoController {
...
@@ -206,23 +205,11 @@ public class SysBaseSetInfoController {
@PostMapping
(
"/inner/getSocialHouseBaseSet"
)
@PostMapping
(
"/inner/getSocialHouseBaseSet"
)
public
SysBaseSetInfoVo
getSocialHouseBaseSet
(
@RequestBody
String
houseId
)
{
public
SysBaseSetInfoVo
getSocialHouseBaseSet
(
@RequestBody
String
houseId
)
{
SysBaseSetInfo
baseSetInfo
=
sysBaseSetInfoService
.
getById
(
houseId
);
SysBaseSetInfo
baseSetInfo
=
sysBaseSetInfoService
.
getById
(
houseId
);
SysBaseSetInfo
baseSetLast
;
SysBaseSetInfoVo
sysBaseSetInfoVo
=
new
SysBaseSetInfoVo
();
if
(
null
!=
baseSetInfo
&&
CommonConstants
.
ONE_STRING
.
equals
(
baseSetInfo
.
getBaseType
())){
if
(
null
!=
baseSetInfo
&&
CommonConstants
.
ONE_STRING
.
equals
(
baseSetInfo
.
getBaseType
())){
Date
date
=
new
Date
();
baseSetInfo
.
setFundProList
(
sysPayProportionService
.
list
(
Wrappers
.<
SysPayProportion
>
query
().
lambda
().
eq
(
SysPayProportion:
:
getSysBaseSetId
,
houseId
)));
baseSetLast
=
sysBaseSetInfoService
.
getOne
(
Wrappers
.<
SysBaseSetInfo
>
query
().
lambda
()
.
eq
(
SysBaseSetInfo:
:
getDepartName
,
baseSetInfo
.
getDepartName
())
.
eq
(
SysBaseSetInfo:
:
getBaseType
,
baseSetInfo
.
getBaseType
())
.
eq
(
SysBaseSetInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
SysBaseSetInfo:
:
getStatus
,
CommonConstants
.
ZERO_STRING
)
.
ge
(
SysBaseSetInfo:
:
getApplyStartDate
,
date
)
.
and
(
obj
->
obj
.
le
(
SysBaseSetInfo:
:
getApplyEndDate
,
date
).
or
(
obj1
->
obj1
.
isNull
(
SysBaseSetInfo:
:
getApplyEndDate
)))
);
if
(
null
!=
baseSetLast
){
baseSetLast
.
setFundProList
(
sysPayProportionService
.
list
(
Wrappers
.<
SysPayProportion
>
query
().
lambda
().
eq
(
SysPayProportion:
:
getSysBaseSetId
,
baseSetLast
.
getId
())));
BeanCopyUtils
.
copyProperties
(
baseSetLast
,
sysBaseSetInfoVo
);
}
}
}
SysBaseSetInfoVo
sysBaseSetInfoVo
=
new
SysBaseSetInfoVo
();
BeanCopyUtils
.
copyProperties
(
baseSetInfo
,
sysBaseSetInfoVo
);
return
sysBaseSetInfoVo
;
return
sysBaseSetInfoVo
;
}
}
/**
/**
...
...
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