Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
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
Administrator
dsk-cr20g
Commits
5fc9bb3e
Commit
5fc9bb3e
authored
Jun 27, 2023
by
dengguangman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
-
parent
0ff10beb
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
28 additions
and
18 deletions
+28
-18
CustomerMapper.java
...m/src/main/java/com/dsk/system/mapper/CustomerMapper.java
+2
-0
ICustomerService.java
...rc/main/java/com/dsk/system/service/ICustomerService.java
+3
-4
CustomerServiceImpl.java
...java/com/dsk/system/service/impl/CustomerServiceImpl.java
+7
-4
UrbanInvestmentPlatformServiceImpl.java
...stem/service/impl/UrbanInvestmentPlatformServiceImpl.java
+5
-10
CustomerMapper.xml
.../main/resources/mapper/system/customer/CustomerMapper.xml
+11
-0
No files found.
dsk-system/src/main/java/com/dsk/system/mapper/CustomerMapper.java
View file @
5fc9bb3e
...
...
@@ -28,5 +28,7 @@ public interface CustomerMapper extends BaseMapper<Customer> {
List
<
CustomerStatusListVo
>
selectStatusList
(
@Param
(
"uipIds"
)
List
<
String
>
uipIds
,
@Param
(
"userId"
)
Long
userId
);
List
<
String
>
selectUipIdList
(
@Param
(
"uipIds"
)
List
<
String
>
uipIds
,
@Param
(
"userId"
)
Long
userId
);
}
dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java
View file @
5fc9bb3e
...
...
@@ -3,10 +3,7 @@ package com.dsk.system.service;
import
com.dsk.system.domain.customer.Customer
;
import
com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto
;
import
com.dsk.system.domain.customer.dto.CustomerSearchDto
;
import
com.dsk.system.domain.customer.vo.CustomerBusinessListVo
;
import
com.dsk.system.domain.customer.vo.CustomerListVo
;
import
com.dsk.system.domain.customer.vo.CustomerStatusListVo
;
import
com.dsk.system.domain.customer.vo.CustomerVo
;
import
com.dsk.system.domain.customer.vo.*
;
import
java.util.List
;
...
...
@@ -32,4 +29,6 @@ public interface ICustomerService {
List
<
CustomerStatusListVo
>
selectStatusList
(
List
<
String
>
uipIds
);
List
<
String
>
selectUipIdList
(
List
<
String
>
uipIds
);
}
dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java
View file @
5fc9bb3e
...
...
@@ -11,10 +11,7 @@ import com.dsk.system.domain.customer.Customer;
import
com.dsk.system.domain.customer.CustomerUser
;
import
com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto
;
import
com.dsk.system.domain.customer.dto.CustomerSearchDto
;
import
com.dsk.system.domain.customer.vo.CustomerBusinessListVo
;
import
com.dsk.system.domain.customer.vo.CustomerListVo
;
import
com.dsk.system.domain.customer.vo.CustomerStatusListVo
;
import
com.dsk.system.domain.customer.vo.CustomerVo
;
import
com.dsk.system.domain.customer.vo.*
;
import
com.dsk.system.dskService.EnterpriseService
;
import
com.dsk.system.mapper.CustomerMapper
;
import
com.dsk.system.mapper.CustomerUserMapper
;
...
...
@@ -131,4 +128,10 @@ public class CustomerServiceImpl implements ICustomerService {
return
baseMapper
.
selectStatusList
(
uipIds
,
SecurityUtils
.
getUserId
());
}
@Override
public
List
<
String
>
selectUipIdList
(
List
<
String
>
uipIds
)
{
return
baseMapper
.
selectUipIdList
(
uipIds
,
SecurityUtils
.
getUserId
());
}
}
dsk-system/src/main/java/com/dsk/system/service/impl/UrbanInvestmentPlatformServiceImpl.java
View file @
5fc9bb3e
...
...
@@ -5,7 +5,6 @@ import com.dsk.acc.openapi.client.util.CommonUtils;
import
com.dsk.common.core.domain.AjaxResult
;
import
com.dsk.common.dtos.UrbanInvestmentPlatformDto
;
import
com.dsk.common.utils.DskOpenApiUtil
;
import
com.dsk.system.domain.customer.vo.CustomerStatusListVo
;
import
com.dsk.system.service.ICustomerService
;
import
com.dsk.system.service.UrbanInvestmentPlatformService
;
import
org.apache.commons.collections4.CollectionUtils
;
...
...
@@ -52,23 +51,19 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
for
(
Object
dataMap
:
list
)
{
uipIds
.
add
(
MapUtils
.
getString
(
CommonUtils
.
assertAsMap
(
dataMap
),
"uipId"
));
}
List
<
CustomerStatusListVo
>
claimStatusList
=
iCustomerService
.
selectStatusList
(
uipIds
);
List
<
String
>
claimStatusList
=
iCustomerService
.
selectUipIdList
(
uipIds
);
//按照城投企业id合并两个list
for
(
Object
companyObj
:
list
)
{
Map
<
String
,
Object
>
companyMap
=
CommonUtils
.
assertAsMap
(
companyObj
);
String
uipId
=
MapUtils
.
getString
(
companyMap
,
"uipId"
,
"uipId"
);
if
(
CollectionUtils
.
isEmpty
(
claimStatusList
))
{
companyMap
.
put
(
"claimStatus"
,
0
);
}
for
(
CustomerStatusListVo
vo
:
claimStatusList
)
{
if
(
uipId
.
equals
(
vo
.
getUipId
()))
{
}
else
if
(
claimStatusList
.
contains
(
uipId
))
{
companyMap
.
put
(
"claimStatus"
,
1
);
}
else
{
companyMap
.
put
(
"claimStatus"
,
0
);
}
}
}
return
BeanUtil
.
toBean
(
map
,
AjaxResult
.
class
);
}
...
...
dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml
View file @
5fc9bb3e
...
...
@@ -69,5 +69,16 @@
</foreach>
</select>
<select
id=
"selectUipIdList"
resultType=
"java.lang.String"
>
select
ct.uip_id
from customer ct
join customer_user ctu on ct.customer_id = ctu.customer_id
where ctu.user_id = #{userId} and ct.uip_id in
<foreach
collection=
"uipIds"
item=
"uipId"
open=
"("
separator=
","
close=
")"
>
#{uipId}
</foreach>
</select>
</mapper>
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