Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
邬吉朋
relation
Commits
fe9324cc
Commit
fe9324cc
authored
Sep 02, 2025
by
wujipeng
Browse files
人与人关系弹框分页-优化
parent
f471cb97
Changes
6
Show whitespace changes
Inline
Side-by-side
src/main/java/com/platform/mapper/ExcelDataMapper.java
View file @
fe9324cc
...
@@ -31,10 +31,14 @@ public interface ExcelDataMapper extends BaseMapper<ExcelDataEntity> {
...
@@ -31,10 +31,14 @@ public interface ExcelDataMapper extends BaseMapper<ExcelDataEntity> {
List
<
ExcelDataEntity
>
cashFlow
(
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
cashFlow
(
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
relationPage
(
@Param
(
"oneselfAccountList"
)
List
<
String
>
oneselfAccountList
,
@Param
(
"otherAccountList"
)
List
<
String
>
otherAccountList
);
List
<
ExcelDataEntity
>
relationPage
(
@Param
(
"oneselfAccountList"
)
List
<
String
>
oneselfAccountList
,
@Param
(
"otherAccountList"
)
List
<
String
>
otherAccountList
,
@Param
(
"userDTO"
)
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
queryInfoList
(
CaseDTO
caseDTO
);
List
<
ExcelDataEntity
>
queryInfoList
(
CaseDTO
caseDTO
);
List
<
AssociationVO
>
queryAccountTemporary
(
UserDTO
userDTO
);
List
<
AssociationVO
>
queryAccountTemporary
(
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
accountCashFlow
(
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
accountCashFlow
(
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
queryListByPayeeNameAndPayUserName
(
@Param
(
"payeeName"
)
String
payeeName
,
@Param
(
"caseId"
)
int
caseId
);
List
<
ExcelDataEntity
>
queryListByPayeeNameAndPayUserName
(
@Param
(
"payeeName"
)
String
payeeName
,
@Param
(
"caseId"
)
int
caseId
);
...
...
src/main/java/com/platform/service/ExcelDataService.java
View file @
fe9324cc
...
@@ -53,7 +53,7 @@ public interface ExcelDataService extends IService<ExcelDataEntity> {
...
@@ -53,7 +53,7 @@ public interface ExcelDataService extends IService<ExcelDataEntity> {
List
<
ExcelDataEntity
>
cashFlow
(
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
cashFlow
(
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
relationPage
(
List
<
String
>
oneselfAccountList
,
List
<
String
>
otherAccountList
);
List
<
ExcelDataEntity
>
relationPage
(
List
<
String
>
oneselfAccountList
,
List
<
String
>
otherAccountList
,
UserDTO
userDTO
);
List
<
ExcelDataEntity
>
queryInfoList
(
CaseDTO
caseDTO
);
List
<
ExcelDataEntity
>
queryInfoList
(
CaseDTO
caseDTO
);
...
...
src/main/java/com/platform/service/impl/ExcelDataServiceImpl.java
View file @
fe9324cc
...
@@ -84,8 +84,8 @@ public class ExcelDataServiceImpl extends ServiceImpl<ExcelDataMapper, ExcelData
...
@@ -84,8 +84,8 @@ public class ExcelDataServiceImpl extends ServiceImpl<ExcelDataMapper, ExcelData
}
}
@Override
@Override
public
List
<
ExcelDataEntity
>
relationPage
(
List
<
String
>
oneselfAccountList
,
List
<
String
>
otherAccountList
)
{
public
List
<
ExcelDataEntity
>
relationPage
(
List
<
String
>
oneselfAccountList
,
List
<
String
>
otherAccountList
,
UserDTO
userDTO
)
{
return
baseMapper
.
relationPage
(
oneselfAccountList
,
otherAccountList
);
return
baseMapper
.
relationPage
(
oneselfAccountList
,
otherAccountList
,
userDTO
);
}
}
@Override
@Override
...
@@ -148,6 +148,6 @@ public class ExcelDataServiceImpl extends ServiceImpl<ExcelDataMapper, ExcelData
...
@@ -148,6 +148,6 @@ public class ExcelDataServiceImpl extends ServiceImpl<ExcelDataMapper, ExcelData
@Override
@Override
public
List
<
ExcelDataVO
>
queryOtherAccountList
(
String
otherUserName
,
int
caseId
)
{
public
List
<
ExcelDataVO
>
queryOtherAccountList
(
String
otherUserName
,
int
caseId
)
{
return
baseMapper
.
queryOtherAccountList
(
otherUserName
,
caseId
);
return
baseMapper
.
queryOtherAccountList
(
otherUserName
,
caseId
);
}
}
}
}
src/main/java/com/platform/service/impl/UserServiceImpl.java
View file @
fe9324cc
...
@@ -258,14 +258,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
...
@@ -258,14 +258,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, UserEntity> impleme
}
}
List
<
String
>
otherAccountList
=
Lists
.
newArrayList
(
otherAccountSet
);
List
<
String
>
otherAccountList
=
Lists
.
newArrayList
(
otherAccountSet
);
PageHelper
.
startPage
(
userDTO
.
getPageNum
(),
userDTO
.
getPageSize
());
List
<
ExcelDataEntity
>
details
=
Lists
.
newArrayList
();
List
<
ExcelDataEntity
>
details
=
Lists
.
newArrayList
();
if
(!
ObjectUtils
.
isEmpty
(
oneselfAccountList
)
&&
!
ObjectUtils
.
isEmpty
(
otherAccountList
))
{
if
(!
ObjectUtils
.
isEmpty
(
oneselfAccountList
)
&&
!
ObjectUtils
.
isEmpty
(
otherAccountList
))
{
details
=
excelDataService
.
relationPage
(
oneselfAccountList
,
otherAccountList
);
details
=
excelDataService
.
relationPage
(
oneselfAccountList
,
otherAccountList
,
userDTO
);
everyoneVO
.
setDetails
(
details
);
everyoneVO
.
setDetails
(
details
);
}
}
PageHelper
.
clearPage
();
//汇总文字
//汇总文字
List
<
String
>
totalDescription
=
Lists
.
newArrayList
();
List
<
String
>
totalDescription
=
Lists
.
newArrayList
();
//入账次数
//入账次数
...
...
src/main/resources/application.yml
View file @
fe9324cc
server
:
server
:
port
:
8730
port
:
8730
spring
:
datasource
:
username
:
root
password
:
RZKJ_0415$
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://47.110.71.183:3306/relation?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
#spring:
#spring:
# datasource:
# datasource:
# username: root
# username: root
# password:
admin123456
# password:
RZKJ_0415$
# driver-class-name: com.mysql.cj.jdbc.Driver
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://127.0.0.1:3306/relation?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
# url: jdbc:mysql://47.110.71.183:3306/relation?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
spring
:
datasource
:
username
:
root
password
:
admin123456
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://127.0.0.1:3306/relation?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
servlet
:
servlet
:
multipart
:
multipart
:
...
...
src/main/resources/com/platform/mapper/ExcelDataMapper.xml
View file @
fe9324cc
...
@@ -170,7 +170,7 @@
...
@@ -170,7 +170,7 @@
SELECT distinct direction, amount, time, payee_account, payment_account
SELECT distinct direction, amount, time, payee_account, payment_account
FROM excel_data
FROM excel_data
WHERE
WHERE
(payee_account IN
(
(payee_account IN
<foreach
item=
"item"
collection=
"oneselfAccountList"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"item"
collection=
"oneselfAccountList"
open=
"("
separator=
","
close=
")"
>
#{item}
#{item}
</foreach>
</foreach>
...
@@ -186,7 +186,19 @@
...
@@ -186,7 +186,19 @@
AND payment_account IN
AND payment_account IN
<foreach
item=
"item"
collection=
"oneselfAccountList"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"item"
collection=
"oneselfAccountList"
open=
"("
separator=
","
close=
")"
>
#{item}
#{item}
</foreach>
)
</foreach>
))
<if
test=
"userDTO.startTime != null"
>
and time >= #{userDTO.startTime}
</if>
<if
test=
"userDTO.endTime != null"
>
and time
<
= #{userDTO.endTime}
</if>
<if
test=
"userDTO.minAmount != null"
>
and amount >= #{userDTO.minAmount}
</if>
<if
test=
"userDTO.maxAmount != null"
>
and amount
<
= #{userDTO.maxAmount}
</if>
</select>
</select>
<select
id=
"queryInfoList"
resultType=
"com.platform.model.entity.ExcelDataEntity"
>
<select
id=
"queryInfoList"
resultType=
"com.platform.model.entity.ExcelDataEntity"
>
...
...
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