Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1-office-web-sit
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
吴迪
gs1-office-web-sit
Commits
e9339239
Commit
e9339239
authored
Jun 12, 2022
by
吴迪
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改】商品预览
parent
69ee1a6c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
8 deletions
+12
-8
ProductController.java
...o/office/modules/manage/controller/ProductController.java
+1
-1
ProductDao.java
src/main/java/io/office/modules/manage/dao/ProductDao.java
+1
-1
KnowledgecategoryEntity.java
...office/modules/manage/entity/KnowledgecategoryEntity.java
+0
-1
ProductService.java
...java/io/office/modules/manage/service/ProductService.java
+1
-1
ProductServiceImpl.java
...ffice/modules/manage/service/impl/ProductServiceImpl.java
+2
-2
ProductDao.xml
src/main/resources/mapper/manage/ProductDao.xml
+7
-2
No files found.
src/main/java/io/office/modules/manage/controller/ProductController.java
View file @
e9339239
...
@@ -120,7 +120,7 @@ public class ProductController extends AbstractController {
...
@@ -120,7 +120,7 @@ public class ProductController extends AbstractController {
public
R
findPage
(
@RequestBody
Map
<
String
,
String
>
param
){
public
R
findPage
(
@RequestBody
Map
<
String
,
String
>
param
){
Page
<
ProductEntity
>
pag
=
this
.
productService
.
findPage
(
Page
<
ProductEntity
>
pag
=
this
.
productService
.
findPage
(
new
Page
(
Integer
.
valueOf
(
param
.
get
(
"page"
)),
new
Page
(
Integer
.
valueOf
(
param
.
get
(
"page"
)),
Integer
.
valueOf
(
param
.
get
(
"size"
))));
Integer
.
valueOf
(
param
.
get
(
"size"
)))
,
param
.
get
(
"id"
)
);
PageUtils
pageUtils
=
new
PageUtils
(
pag
);
PageUtils
pageUtils
=
new
PageUtils
(
pag
);
return
R
.
ok
().
put
(
"page"
,
pageUtils
);
return
R
.
ok
().
put
(
"page"
,
pageUtils
);
}
}
...
...
src/main/java/io/office/modules/manage/dao/ProductDao.java
View file @
e9339239
...
@@ -19,5 +19,5 @@ import java.util.Map;
...
@@ -19,5 +19,5 @@ import java.util.Map;
public
interface
ProductDao
extends
BaseMapper
<
ProductEntity
>
{
public
interface
ProductDao
extends
BaseMapper
<
ProductEntity
>
{
List
<
ProductEntity
>
selectProductList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
,
Page
page
);
List
<
ProductEntity
>
selectProductList
(
@Param
(
"params"
)
Map
<
String
,
Object
>
params
,
Page
page
);
List
<
ProductEntity
>
findPage
(
Page
page
);
List
<
ProductEntity
>
findPage
(
Page
page
,
@Param
(
"id"
)
Object
id
);
}
}
src/main/java/io/office/modules/manage/entity/KnowledgecategoryEntity.java
View file @
e9339239
...
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
...
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.Date
;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
...
...
src/main/java/io/office/modules/manage/service/ProductService.java
View file @
e9339239
...
@@ -28,6 +28,6 @@ public interface ProductService extends IService<ProductEntity> {
...
@@ -28,6 +28,6 @@ public interface ProductService extends IService<ProductEntity> {
Page
<
ProductEntity
>
selectProductList
(
Map
<
String
,
Object
>
params
,
Page
page
);
Page
<
ProductEntity
>
selectProductList
(
Map
<
String
,
Object
>
params
,
Page
page
);
Page
<
ProductEntity
>
findPage
(
Page
page
);
Page
<
ProductEntity
>
findPage
(
Page
page
,
Object
id
);
}
}
src/main/java/io/office/modules/manage/service/impl/ProductServiceImpl.java
View file @
e9339239
...
@@ -81,8 +81,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductDao, ProductEntity> i
...
@@ -81,8 +81,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductDao, ProductEntity> i
}
}
@Override
@Override
public
Page
<
ProductEntity
>
findPage
(
Page
page
)
{
public
Page
<
ProductEntity
>
findPage
(
Page
page
,
Object
id
)
{
List
<
ProductEntity
>
list
=
this
.
productDao
.
findPage
(
page
);
List
<
ProductEntity
>
list
=
this
.
productDao
.
findPage
(
page
,
id
);
page
.
setRecords
(
list
);
page
.
setRecords
(
list
);
return
page
;
return
page
;
}
}
...
...
src/main/resources/mapper/manage/ProductDao.xml
View file @
e9339239
...
@@ -57,7 +57,11 @@
...
@@ -57,7 +57,11 @@
</if>
</if>
order by a.id desc
order by a.id desc
</select>
</select>
<select
id=
"findPage"
resultType=
"io.office.modules.manage.entity.ProductEntity"
>
<select
id=
"findPage"
resultType=
"io.office.modules.manage.entity.ProductEntity"
parameterType=
"string"
>
select * from product where levels > 0 and categoryid=1 ORDER BY levels DESC, adddate DESC
select * from product where levels > 0 and categoryid=1
<if
test=
""
>
and id =#{id}
</if>
>
ORDER BY levels DESC, adddate DESC
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
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