Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
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
huluobin
gogirl-miniapp-backend
Commits
4c7f9111
Commit
4c7f9111
authored
Jun 03, 2021
by
liyanlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复打板互通了所有品牌的问题。
parent
68eb68c5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
6 deletions
+9
-6
CareerCmdService.java
.../com/gogirl/application/store/store/CareerCmdService.java
+1
-1
CareerCmdServiceImpl.java
...rl/application/store/store/impl/CareerCmdServiceImpl.java
+2
-2
CareerMapper.java
...girl/infrastructure/mapper/store/career/CareerMapper.java
+2
-1
CareerWorksController.java
...gogirl/interfaces/store/career/CareerWorksController.java
+3
-2
CareerMapper.xml
src/main/resources/mapper/store/CareerMapper.xml
+1
-0
No files found.
src/main/java/com/gogirl/application/store/store/CareerCmdService.java
View file @
4c7f9111
...
@@ -45,7 +45,7 @@ public interface CareerCmdService {
...
@@ -45,7 +45,7 @@ public interface CareerCmdService {
* @param pageSize
* @param pageSize
* @return
* @return
*/
*/
Page
<
BaseProduce
>
queryWorkTpl
(
Integer
technicianId
,
Integer
pageNum
,
Integer
pageSize
,
String
searchKeyWord
);
Page
<
BaseProduce
>
queryWorkTpl
(
Integer
technicianId
,
Integer
pageNum
,
Integer
pageSize
,
String
searchKeyWord
,
Integer
brandId
);
}
}
src/main/java/com/gogirl/application/store/store/impl/CareerCmdServiceImpl.java
View file @
4c7f9111
...
@@ -137,10 +137,10 @@ public class CareerCmdServiceImpl implements CareerCmdService {
...
@@ -137,10 +137,10 @@ public class CareerCmdServiceImpl implements CareerCmdService {
}
}
@Override
@Override
public
Page
<
BaseProduce
>
queryWorkTpl
(
Integer
technicianId
,
Integer
pageNum
,
Integer
pageSize
,
String
searchKeyWord
)
{
public
Page
<
BaseProduce
>
queryWorkTpl
(
Integer
technicianId
,
Integer
pageNum
,
Integer
pageSize
,
String
searchKeyWord
,
Integer
brandId
)
{
Page
<
BaseProduce
>
baseProducePage
=
new
Page
<>(
pageNum
,
pageSize
);
Page
<
BaseProduce
>
baseProducePage
=
new
Page
<>(
pageNum
,
pageSize
);
baseProducePage
=
careerMapper
.
queryWorkTpl
(
baseProducePage
,
technicianId
,
searchKeyWord
);
baseProducePage
=
careerMapper
.
queryWorkTpl
(
baseProducePage
,
technicianId
,
searchKeyWord
,
brandId
);
List
<
PurchaseSku
>
purchaseSkuList
=
purchaseSkuMapper
.
listByProduceIds
(
baseProducePage
.
getRecords
().
stream
().
map
(
BaseProduce:
:
getId
).
collect
(
Collectors
.
toList
()));
List
<
PurchaseSku
>
purchaseSkuList
=
purchaseSkuMapper
.
listByProduceIds
(
baseProducePage
.
getRecords
().
stream
().
map
(
BaseProduce:
:
getId
).
collect
(
Collectors
.
toList
()));
...
...
src/main/java/com/gogirl/infrastructure/mapper/store/career/CareerMapper.java
View file @
4c7f9111
...
@@ -109,5 +109,6 @@ public interface CareerMapper extends BaseMapper<Career> {
...
@@ -109,5 +109,6 @@ public interface CareerMapper extends BaseMapper<Career> {
*/
*/
Page
<
BaseProduce
>
queryWorkTpl
(
@Param
(
"page"
)
Page
<
BaseProduce
>
baseProducePage
,
Page
<
BaseProduce
>
queryWorkTpl
(
@Param
(
"page"
)
Page
<
BaseProduce
>
baseProducePage
,
@Param
(
"technicianId"
)
Integer
technicianId
,
@Param
(
"technicianId"
)
Integer
technicianId
,
@Param
(
"searchKeyWord"
)
String
searchKeyWord
);
@Param
(
"searchKeyWord"
)
String
searchKeyWord
,
@Param
(
"brandId"
)
Integer
brandId
);
}
}
src/main/java/com/gogirl/interfaces/store/career/CareerWorksController.java
View file @
4c7f9111
...
@@ -53,9 +53,10 @@ public class CareerWorksController {
...
@@ -53,9 +53,10 @@ public class CareerWorksController {
@GetMapping
(
"/technician/career/queryWorkTpl"
)
@GetMapping
(
"/technician/career/queryWorkTpl"
)
public
JsonResult
<
Page
<
BaseProduce
>>
queryWorkTpl
(
@RequestParam
Integer
pageNum
,
public
JsonResult
<
Page
<
BaseProduce
>>
queryWorkTpl
(
@RequestParam
Integer
pageNum
,
@RequestParam
Integer
pageSize
,
@RequestParam
Integer
pageSize
,
@RequestParam
(
required
=
false
)
String
searchKeyWord
)
{
@RequestParam
(
required
=
false
)
String
searchKeyWord
,
@RequestHeader
(
"brandId"
)
Integer
brandId
)
{
Integer
technicianId
=
SessionUtils
.
getTechnicianId
();
Integer
technicianId
=
SessionUtils
.
getTechnicianId
();
Page
<
BaseProduce
>
baseProduceList
=
careerCmdService
.
queryWorkTpl
(
technicianId
,
pageNum
,
pageSize
,
searchKeyWord
);
Page
<
BaseProduce
>
baseProduceList
=
careerCmdService
.
queryWorkTpl
(
technicianId
,
pageNum
,
pageSize
,
searchKeyWord
,
brandId
);
return
JsonResult
.
success
(
baseProduceList
);
return
JsonResult
.
success
(
baseProduceList
);
}
}
...
...
src/main/resources/mapper/store/CareerMapper.xml
View file @
4c7f9111
...
@@ -116,6 +116,7 @@
...
@@ -116,6 +116,7 @@
and t1.`name` like concat('%',#{searchKeyWord},'%')
and t1.`name` like concat('%',#{searchKeyWord},'%')
</if>
</if>
and t2.id is null
and t2.id is null
and t1.brand_id = #{brandId}
order by t1.update_time desc
order by t1.update_time desc
</select>
</select>
...
...
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