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
8e01cafd
Commit
8e01cafd
authored
Dec 03, 2021
by
rongkailun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改】bug处理
parent
59455424
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
0 deletions
+26
-0
NewsController.java
...a/io/office/modules/manage/controller/NewsController.java
+2
-0
NewsDao.java
src/main/java/io/office/modules/manage/dao/NewsDao.java
+2
-0
NewsEntity.java
...main/java/io/office/modules/manage/entity/NewsEntity.java
+2
-0
NewsService.java
...in/java/io/office/modules/manage/service/NewsService.java
+2
-0
NewsServiceImpl.java
...o/office/modules/manage/service/impl/NewsServiceImpl.java
+7
-0
IndexCarouselManageDao.xml
src/main/resources/mapper/manage/IndexCarouselManageDao.xml
+3
-0
NewsDao.xml
src/main/resources/mapper/manage/NewsDao.xml
+5
-0
PictureDao.xml
src/main/resources/mapper/manage/PictureDao.xml
+3
-0
No files found.
src/main/java/io/office/modules/manage/controller/NewsController.java
View file @
8e01cafd
...
@@ -52,6 +52,8 @@ public class NewsController extends AbstractController {
...
@@ -52,6 +52,8 @@ public class NewsController extends AbstractController {
// @RequiresPermissions("manage:news:info")
// @RequiresPermissions("manage:news:info")
public
R
info
(
@PathVariable
(
"id"
)
Integer
id
)
{
public
R
info
(
@PathVariable
(
"id"
)
Integer
id
)
{
NewsEntity
news
=
newsService
.
getById
(
id
);
NewsEntity
news
=
newsService
.
getById
(
id
);
String
name
=
this
.
newsService
.
selectClassName
(
news
.
getClassid
());
news
.
setClassName
(
name
);
return
R
.
ok
().
put
(
"news"
,
news
);
return
R
.
ok
().
put
(
"news"
,
news
);
}
}
...
...
src/main/java/io/office/modules/manage/dao/NewsDao.java
View file @
8e01cafd
...
@@ -33,4 +33,6 @@ public interface NewsDao extends BaseMapper<NewsEntity> {
...
@@ -33,4 +33,6 @@ public interface NewsDao extends BaseMapper<NewsEntity> {
List
<
NewsEntity
>
selectRealTimeInfo
(
@Param
(
"newsParams"
)
NewsParams
newsParams
,
Page
page
);
List
<
NewsEntity
>
selectRealTimeInfo
(
@Param
(
"newsParams"
)
NewsParams
newsParams
,
Page
page
);
List
<
NewsEntity
>
getHdbdList
(
@Param
(
"newsParams"
)
NewsParams
newsParams
,
Page
page
);
List
<
NewsEntity
>
getHdbdList
(
@Param
(
"newsParams"
)
NewsParams
newsParams
,
Page
page
);
String
selectClassName
(
Integer
classid
);
}
}
src/main/java/io/office/modules/manage/entity/NewsEntity.java
View file @
8e01cafd
...
@@ -129,5 +129,7 @@ public class NewsEntity implements Serializable {
...
@@ -129,5 +129,7 @@ public class NewsEntity implements Serializable {
* $column.comments
* $column.comments
*/
*/
private
Date
checkdate
;
private
Date
checkdate
;
@TableField
(
exist
=
false
)
private
String
className
;
}
}
src/main/java/io/office/modules/manage/service/NewsService.java
View file @
8e01cafd
...
@@ -34,5 +34,7 @@ public interface NewsService extends IService<NewsEntity> {
...
@@ -34,5 +34,7 @@ public interface NewsService extends IService<NewsEntity> {
List
<
NewsEntity
>
selectNewsListCondition
(
NewsEntity
newsEntity
);
List
<
NewsEntity
>
selectNewsListCondition
(
NewsEntity
newsEntity
);
Page
<
NewsEntity
>
selectRealTimeInfo
(
NewsParams
newsParams
,
Page
page
);
Page
<
NewsEntity
>
selectRealTimeInfo
(
NewsParams
newsParams
,
Page
page
);
String
selectClassName
(
Integer
classid
);
}
}
src/main/java/io/office/modules/manage/service/impl/NewsServiceImpl.java
View file @
8e01cafd
...
@@ -120,5 +120,11 @@ public class NewsServiceImpl extends ServiceImpl<NewsDao, NewsEntity> implements
...
@@ -120,5 +120,11 @@ public class NewsServiceImpl extends ServiceImpl<NewsDao, NewsEntity> implements
return
page
;
return
page
;
}
}
@Override
public
String
selectClassName
(
Integer
classid
)
{
String
name
=
this
.
newsDao
.
selectClassName
(
classid
);
return
name
;
}
}
}
\ No newline at end of file
src/main/resources/mapper/manage/IndexCarouselManageDao.xml
View file @
8e01cafd
...
@@ -49,6 +49,9 @@
...
@@ -49,6 +49,9 @@
<if
test=
"indexCarouselManage.classnum !=null and indexCarouselManage.classnum !=''"
>
<if
test=
"indexCarouselManage.classnum !=null and indexCarouselManage.classnum !=''"
>
and t.classnum = #{indexCarouselManage.classnum}
and t.classnum = #{indexCarouselManage.classnum}
</if>
</if>
<if
test=
"indexCarouselManage.startTime !=null and indexCarouselManage.endTime !=null"
>
and starttime_index BETWEEN #{indexCarouselManage.startTime} AND #{indexCarouselManage.endTime}
</if>
<choose>
<choose>
<when
test=
"indexCarouselManage.levels != 0"
>
<when
test=
"indexCarouselManage.levels != 0"
>
AND t.levels = #{indexCarouselManage.levels}
AND t.levels = #{indexCarouselManage.levels}
...
...
src/main/resources/mapper/manage/NewsDao.xml
View file @
8e01cafd
...
@@ -231,4 +231,8 @@
...
@@ -231,4 +231,8 @@
and t1.classid = #{newsParams.classId}
and t1.classid = #{newsParams.classId}
order by t.levels desc,t.showtime desc ,t.id desc
order by t.levels desc,t.showtime desc ,t.id desc
</select>
</select>
<select
id=
"selectClassName"
resultType=
"java.lang.String"
>
SELECT name FROM newsClass t where id = #{classid}
</select>
</mapper>
</mapper>
\ No newline at end of file
src/main/resources/mapper/manage/PictureDao.xml
View file @
8e01cafd
...
@@ -54,6 +54,9 @@
...
@@ -54,6 +54,9 @@
<if
test=
"params.pictureType !='' and params.pictureType !=null"
>
<if
test=
"params.pictureType !='' and params.pictureType !=null"
>
and t.Picture_type =#{params.pictureType}
and t.Picture_type =#{params.pictureType}
</if>
</if>
<if
test=
"params.inputDateStart !=null and params.inputDateEnd !=null"
>
and inputDate BETWEEN #{params.inputDateStart} AND #{params.inputDateEnd}
</if>
<choose>
<choose>
<when
test=
"params.pictureLevel != 0"
>
<when
test=
"params.pictureLevel != 0"
>
AND PicLevel = #{params.pictureLevel}
AND PicLevel = #{params.pictureLevel}
...
...
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