Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit f48267f1
authored
Oct 26, 2023
by
chamberone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修复dao方法
1 parent
0811506e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/BlockServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/FendanServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/BlockServiceImpl.java
View file @
f48267f
...
...
@@ -22,7 +22,7 @@ public class BlockServiceImpl implements IBlockService {
@Override
public
Result
<
Boolean
>
synchronizeBlock
(
String
blockId
,
Long
area
,
RegionDTO
region
)
{
MapBlockInfoEntity
mapBlockInfoEntity
=
mapBlockInfoDao
.
findBy
BlockId
(
blockId
);
MapBlockInfoEntity
mapBlockInfoEntity
=
mapBlockInfoDao
.
findBy
AreaIds
(
blockId
);
if
(
null
==
mapBlockInfoEntity
)
{
return
Result
.
failure
(
blockId
+
" blockId不存在"
);
}
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBlockServiceImpl.java
View file @
f48267f
...
...
@@ -237,7 +237,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
@Transactional
@Override
public
Result
<?>
businessServiceBlockRemove
(
String
blockId
)
throws
BusinessException
{
MapBlockInfoEntity
block
=
mapBlockInfoDao
.
findBy
BlockId
(
blockId
);
MapBlockInfoEntity
block
=
mapBlockInfoDao
.
findBy
AreaIds
(
blockId
);
if
(
block
==
null
)
{
throw
new
BusinessException
(
"区块不存在"
);
}
...
...
@@ -257,7 +257,7 @@ public class BusinessBlockServiceImpl implements BusinessBlockService {
@Override
public
Result
<?>
saasBaseDataLayerUrl
(
String
blockId
)
throws
BusinessException
{
MapBlockInfoEntity
block
=
mapBlockInfoDao
.
findBy
BlockId
(
blockId
);
MapBlockInfoEntity
block
=
mapBlockInfoDao
.
findBy
AreaIds
(
blockId
);
if
(
block
==
null
)
{
throw
new
BusinessException
(
"区块不存在"
);
}
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/FendanServiceImpl.java
View file @
f48267f
...
...
@@ -54,7 +54,7 @@ public class FendanServiceImpl implements FendanService {
//2:根据查询出区划匹配工作队
String
peaBrand
=
fixBrand
(
request
.
getBrand
());
List
<
String
>
blockIds
=
blockInfos
.
stream
().
map
(
SaasUtils
.
BlockInfo
::
getBlockId
).
distinct
().
collect
(
Collectors
.
toList
());
List
<
MapBlockInfoEntity
>
mapBlockInfoEntities
=
mapBlockInfoDao
.
findBy
BlockId
In
(
blockIds
);
List
<
MapBlockInfoEntity
>
mapBlockInfoEntities
=
mapBlockInfoDao
.
findBy
AreaIds
In
(
blockIds
);
if
(
CollectionUtils
.
isEmpty
(
mapBlockInfoEntities
))
{
return
Result
.
failed
(
StatusCodeEnum
.
FENDAN_TEAM_UNMATCHED
);
}
...
...
@@ -156,7 +156,7 @@ public class FendanServiceImpl implements FendanService {
//区划所在范围并分配到具体技能的工作队
List
<
MapBlockInfoEntity
>
mapBlockInfoList
=
mapBlockInfoDao
.
listTeamIdByBrandAndSkillAndBlockIds
(
peaBrand
,
request
.
getProductType
(),
request
.
getServiceType
(),
blockIds
);
//区划所在范围所有工作队
List
<
MapBlockInfoEntity
>
mapBlockInBlockIdsList
=
mapBlockInfoDao
.
findBy
BlockId
In
(
blockIds
);
List
<
MapBlockInfoEntity
>
mapBlockInBlockIdsList
=
mapBlockInfoDao
.
findBy
AreaIds
In
(
blockIds
);
if
(
CollectionUtils
.
isEmpty
(
mapBlockInfoList
)
&&
CollectionUtils
.
isEmpty
(
mapBlockInBlockIdsList
))
{
return
Result
.
failed
(
StatusCodeEnum
.
FENDAN_TEAM_UNMATCHED
);
}
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment