Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
H
hxkf
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
hxkf
Commits
57ceb0e2
提交
57ceb0e2
authored
4月 22, 2020
作者:
liupengfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
07f5d082
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
17 行增加
和
20 行删除
+17
-20
EbookController.java
...om/zrqx/resource/bg/controller/ebook/EbookController.java
+2
-2
ResourceLibraryController.java
...controller/resourcelibrary/ResourceLibraryController.java
+3
-3
AuthorLibraryMapper.java
...resource/bg/mapper/authorLibrary/AuthorLibraryMapper.java
+2
-2
PromotionContentServiceImpl.java
...rce/bg/service/marketing/PromotionContentServiceImpl.java
+1
-1
AuthorLibraryDiytype.java
...rce/commons/model/authorLibrary/AuthorLibraryDiytype.java
+2
-2
EbookDiyType.java
...a/com/zrqx/resource/commons/model/ebook/EbookDiyType.java
+1
-1
FgAuthorLibraryDiytypeMapper.java
...fg/mapper/authorlibrary/FgAuthorLibraryDiytypeMapper.java
+1
-1
FgAuthorLibraryMapper.java
...source/fg/mapper/authorlibrary/FgAuthorLibraryMapper.java
+1
-1
FgEbookMapper.java
...java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java
+4
-7
没有找到文件。
app/resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java
浏览文件 @
57ceb0e2
...
@@ -648,7 +648,7 @@ public class EbookController {
...
@@ -648,7 +648,7 @@ public class EbookController {
EbookDiyType
edt
=
new
EbookDiyType
();
EbookDiyType
edt
=
new
EbookDiyType
();
edt
.
setEbookId
(
ev
.
getEbook
().
getId
());
edt
.
setEbookId
(
ev
.
getEbook
().
getId
());
edt
.
setCode
(
ev
.
getCode
());
edt
.
setCode
(
ev
.
getCode
());
edt
.
setD
iyType
Id
(
ev
.
getDtId
());
edt
.
setD
t
Id
(
ev
.
getDtId
());
dtservice
.
insert
(
edt
);
dtservice
.
insert
(
edt
);
ev
.
getChapterSet
().
forEach
(
chapter
->
{
ev
.
getChapterSet
().
forEach
(
chapter
->
{
chapter
.
setBookid
(
ev
.
getBook
().
getId
());
chapter
.
setBookid
(
ev
.
getBook
().
getId
());
...
@@ -848,7 +848,7 @@ public class EbookController {
...
@@ -848,7 +848,7 @@ public class EbookController {
EbookDiyType
edt
=
new
EbookDiyType
();
EbookDiyType
edt
=
new
EbookDiyType
();
edt
.
setEbookId
(
ev
.
getEbook
().
getId
());
edt
.
setEbookId
(
ev
.
getEbook
().
getId
());
edt
.
setCode
(
ev
.
getCode
());
edt
.
setCode
(
ev
.
getCode
());
edt
.
setD
iyType
Id
(
ev
.
getDtId
());
edt
.
setD
t
Id
(
ev
.
getDtId
());
dtservice
.
insert
(
edt
);
dtservice
.
insert
(
edt
);
}
}
if
(
ev
.
getChapterSet
()
!=
null
&&
ev
.
getChapterSet
().
size
()
>
0
)
{
if
(
ev
.
getChapterSet
()
!=
null
&&
ev
.
getChapterSet
().
size
()
>
0
)
{
...
...
app/resource/src/main/java/com/zrqx/resource/bg/controller/resourcelibrary/ResourceLibraryController.java
浏览文件 @
57ceb0e2
...
@@ -586,8 +586,8 @@ public class ResourceLibraryController {
...
@@ -586,8 +586,8 @@ public class ResourceLibraryController {
for
(
int
i
=
0
;
i
<
form
.
getDiyTypeId
().
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
form
.
getDiyTypeId
().
size
();
i
++)
{
AuthorLibraryDiytype
obj
=
new
AuthorLibraryDiytype
();
AuthorLibraryDiytype
obj
=
new
AuthorLibraryDiytype
();
obj
.
setAuthorLibraryId
(
objectId
);
obj
.
setAuthorLibraryId
(
objectId
);
obj
.
setD
iytype
Id
(
Integer
.
parseInt
(
form
.
getDiyTypeId
().
get
(
i
)));
obj
.
setD
t
Id
(
Integer
.
parseInt
(
form
.
getDiyTypeId
().
get
(
i
)));
obj
.
set
Diytype
Code
(
form
.
getDiyTypeCode
().
get
(
i
));
obj
.
setCode
(
form
.
getDiyTypeCode
().
get
(
i
));
list
.
add
(
obj
);
list
.
add
(
obj
);
}
}
});
});
...
@@ -606,7 +606,7 @@ public class ResourceLibraryController {
...
@@ -606,7 +606,7 @@ public class ResourceLibraryController {
for
(
int
i
=
0
;
i
<
form
.
getDiyTypeId
().
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
form
.
getDiyTypeId
().
size
();
i
++)
{
EbookDiyType
obj
=
new
EbookDiyType
();
EbookDiyType
obj
=
new
EbookDiyType
();
obj
.
setEbookId
(
objectId
);
obj
.
setEbookId
(
objectId
);
obj
.
setD
iyType
Id
(
Integer
.
parseInt
(
form
.
getDiyTypeId
().
get
(
i
)));
obj
.
setD
t
Id
(
Integer
.
parseInt
(
form
.
getDiyTypeId
().
get
(
i
)));
obj
.
setCode
(
form
.
getDiyTypeCode
().
get
(
i
));
obj
.
setCode
(
form
.
getDiyTypeCode
().
get
(
i
));
list
.
add
(
obj
);
list
.
add
(
obj
);
}
}
...
...
app/resource/src/main/java/com/zrqx/resource/bg/mapper/authorLibrary/AuthorLibraryMapper.java
浏览文件 @
57ceb0e2
...
@@ -21,7 +21,7 @@ public interface AuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
...
@@ -21,7 +21,7 @@ public interface AuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
+
" like(a.name,form.name) "
+
" like(a.name,form.name) "
+
" like(a.title,form.title) "
+
" like(a.title,form.title) "
+
" like(a.institutionName,form.institutionName) "
+
" like(a.institutionName,form.institutionName) "
+
" like(t.
diytypeC
ode,form.diyTypeCode) "
+
" like(t.
c
ode,form.diyTypeCode) "
/*+ "<if test='form.diyTypeId != null and form.diyTypeId.size > 0'>"
/*+ "<if test='form.diyTypeId != null and form.diyTypeId.size > 0'>"
+ "and t.diytypeid in "
+ "and t.diytypeid in "
...
@@ -46,7 +46,7 @@ public interface AuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
...
@@ -46,7 +46,7 @@ public interface AuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
+
" where 1 = 1 and a.status = 1 "
+
" where 1 = 1 and a.status = 1 "
+
" like(a.name,form.title) "
+
" like(a.name,form.title) "
+
" like(t.
diytypeC
ode,form.diyTypeCode) "
+
" like(t.
c
ode,form.diyTypeCode) "
+
"<if test='form.ids != null and form.ids.size > 0'>"
+
"<if test='form.ids != null and form.ids.size > 0'>"
+
"and a.id not in "
+
"and a.id not in "
...
...
app/resource/src/main/java/com/zrqx/resource/bg/service/marketing/PromotionContentServiceImpl.java
浏览文件 @
57ceb0e2
...
@@ -131,7 +131,7 @@ public class PromotionContentServiceImpl extends BaseServiceImpl<PromotionConten
...
@@ -131,7 +131,7 @@ public class PromotionContentServiceImpl extends BaseServiceImpl<PromotionConten
List
<
EbookDiyType
>
dy
=
ebookDiyTypeMapper
.
select
(
eb
);
List
<
EbookDiyType
>
dy
=
ebookDiyTypeMapper
.
select
(
eb
);
if
(
dy
!=
null
&&
dy
.
size
()
>
0
){
if
(
dy
!=
null
&&
dy
.
size
()
>
0
){
for
(
EbookDiyType
d
:
dy
){
for
(
EbookDiyType
d
:
dy
){
DiyType
result
=
diyTypeMapper
.
selectByPrimaryKey
(
d
.
getD
iyType
Id
());
DiyType
result
=
diyTypeMapper
.
selectByPrimaryKey
(
d
.
getD
t
Id
());
// 判断响应是否正确
// 判断响应是否正确
if
(
result
!=
null
)
{
if
(
result
!=
null
)
{
diyType
+=
result
.
getTypeName
()
+
","
;
diyType
+=
result
.
getTypeName
()
+
","
;
...
...
app/resource/src/main/java/com/zrqx/resource/commons/model/authorLibrary/AuthorLibraryDiytype.java
浏览文件 @
57ceb0e2
...
@@ -20,7 +20,7 @@ public class AuthorLibraryDiytype {
...
@@ -20,7 +20,7 @@ public class AuthorLibraryDiytype {
@ApiModelProperty
(
"作者Id"
)
@ApiModelProperty
(
"作者Id"
)
private
String
authorLibraryId
;
private
String
authorLibraryId
;
@ApiModelProperty
(
"类别Id"
)
@ApiModelProperty
(
"类别Id"
)
private
Integer
d
iytype
Id
;
private
Integer
d
t
Id
;
@ApiModelProperty
(
"类别Code"
)
@ApiModelProperty
(
"类别Code"
)
private
String
diytypeC
ode
;
private
String
c
ode
;
}
}
app/resource/src/main/java/com/zrqx/resource/commons/model/ebook/EbookDiyType.java
浏览文件 @
57ceb0e2
...
@@ -19,7 +19,7 @@ public class EbookDiyType {
...
@@ -19,7 +19,7 @@ public class EbookDiyType {
@ApiModelProperty
(
"电子书Id"
)
@ApiModelProperty
(
"电子书Id"
)
private
String
ebookId
;
private
String
ebookId
;
@ApiModelProperty
(
"类别Id"
)
@ApiModelProperty
(
"类别Id"
)
private
Integer
d
iyType
Id
;
private
Integer
d
t
Id
;
@ApiModelProperty
(
"类别Code"
)
@ApiModelProperty
(
"类别Code"
)
private
String
code
;
private
String
code
;
}
}
app/resource/src/main/java/com/zrqx/resource/fg/mapper/authorlibrary/FgAuthorLibraryDiytypeMapper.java
浏览文件 @
57ceb0e2
...
@@ -14,7 +14,7 @@ public interface FgAuthorLibraryDiytypeMapper extends BaseMapper<AuthorLibraryDi
...
@@ -14,7 +14,7 @@ public interface FgAuthorLibraryDiytypeMapper extends BaseMapper<AuthorLibraryDi
+
"select dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
+
"select dt.id, dt.parentId, dt.sort, dt.showName, dt.code "
+
"from res_Author_Library a "
+
"from res_Author_Library a "
+
"left join res_Author_Library_Diy_Type ad on a.id = ad.authorlibraryid "
+
"left join res_Author_Library_Diy_Type ad on a.id = ad.authorlibraryid "
+
"left join res_Diy_Type dt on ad.
diytypeC
ode = dt.code "
+
"left join res_Diy_Type dt on ad.
c
ode = dt.code "
+
"where 1=1 "
+
"where 1=1 "
+
"and a.status = 1 and dt.status = 1 "
+
"and a.status = 1 and dt.status = 1 "
+
"<if test='"
+
LIST_NOT_EMPTY
+
"(ids)'>"
+
"<if test='"
+
LIST_NOT_EMPTY
+
"(ids)'>"
...
...
app/resource/src/main/java/com/zrqx/resource/fg/mapper/authorlibrary/FgAuthorLibraryMapper.java
浏览文件 @
57ceb0e2
...
@@ -77,7 +77,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
...
@@ -77,7 +77,7 @@ public interface FgAuthorLibraryMapper extends BaseMapper<AuthorLibrary> {
+
"where 1 = 1 and a.status = 1 "
+
"where 1 = 1 and a.status = 1 "
+
" eq(a.nationsType,form.nationsType) "
+
" eq(a.nationsType,form.nationsType) "
+
"<if test='form.diyTypeCode != null and form.diyTypeCode.size > 0'>"
+
"<if test='form.diyTypeCode != null and form.diyTypeCode.size > 0'>"
+
" and t.
diytypeC
ode like "
+
" and t.
c
ode like "
+
" <foreach collection=\"form.diyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">"
+
" <foreach collection=\"form.diyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">"
+
" concat(#{code},'%') "
+
" concat(#{code},'%') "
+
"</foreach>"
+
"</foreach>"
...
...
app/resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java
浏览文件 @
57ceb0e2
...
@@ -130,14 +130,14 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
...
@@ -130,14 +130,14 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
*/
*/
@Select
(
"<script>"
@Select
(
"<script>"
+
"select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+
"select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+
"bb.publishTime, bb.status, b
b.nationsType, be.realPrice, be.priceOption, be.price, be.bookCover, be.summary
, be.bookStatus, be.browseNum, be.goodsType "
+
"bb.publishTime, bb.status, b
e.realPrice, be.priceOption, be.price, be.img, be.synopsis
, be.bookStatus, be.browseNum, be.goodsType "
+
"FROM res_book bb "
+
"FROM res_book bb "
+
"LEFT JOIN res_ebook be ON bb.id = be.id "
+
"LEFT JOIN res_ebook be ON bb.id = be.id "
+
"LEFT JOIN res_ebook_diy_type bdt ON be.id = bdt.ebookId "
+
"LEFT JOIN res_ebook_diy_type bdt ON be.id = bdt.ebookId "
+
"LEFT JOIN res_ebook_label_content_diy_type blcdt on be.id = blcdt.ebookId "
+
"LEFT JOIN res_ebook_label_content_diy_type blcdt on be.id = blcdt.ebookId "
+
"WHERE be.bookStatus = 4 "
+
"WHERE be.bookStatus = 4 "
+
"<if test='diyTypeCode != null and diyTypeCode.size > 0'>"
+
"<if test='diyTypeCode != null and diyTypeCode.size > 0'>"
+
"and bdt.
diytypeC
ode in "
+
"and bdt.
c
ode in "
+
" <foreach collection=\"diyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">"
+
" <foreach collection=\"diyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">"
+
" concat(#{code},'%') "
+
" concat(#{code},'%') "
+
"</foreach>"
+
"</foreach>"
...
@@ -148,9 +148,6 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
...
@@ -148,9 +148,6 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
+
" concat(#{code},'%') "
+
" concat(#{code},'%') "
+
"</foreach>"
+
"</foreach>"
+
"</if>"
+
"</if>"
+
"<if test = 'nationsType != null' >"
+
"and bb.nationsType = #{nationsType} "
+
"</if>"
+
"<if test = 'authorId != null' >"
+
"<if test = 'authorId != null' >"
+
"and bb.authorId = #{authorId} "
+
"and bb.authorId = #{authorId} "
+
"</if>"
+
"</if>"
...
@@ -166,7 +163,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
...
@@ -166,7 +163,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
*/
*/
@Select
(
"<script>"
@Select
(
"<script>"
+
"select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+
"select bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+
"bb.publishTime, bb.status, b
b.nationsType, be.price, be.priceOption, be.realPrice, be.bookCover, be.summary
, be.bookStatus, be.browseNum, be.goodsType "
+
"bb.publishTime, bb.status, b
e.price, be.priceOption, be.realPrice, be.img, be.synopsis
, be.bookStatus, be.browseNum, be.goodsType "
+
"FROM res_book bb "
+
"FROM res_book bb "
+
"LEFT JOIN res_ebook be ON bb.id = be.id "
+
"LEFT JOIN res_ebook be ON bb.id = be.id "
+
"WHERE be.bookStatus = 4 "
+
"WHERE be.bookStatus = 4 "
...
@@ -178,7 +175,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
...
@@ -178,7 +175,7 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
@Select
(
"<script>"
@Select
(
"<script>"
+
"select bb.id, bb.name, "
+
"select bb.id, bb.name, "
+
"bb.publishTime, bb.status,
bb.nationsType,bb.author, be.priceOption, be.price, be.realPrice, be.bookCover
, be.bookStatus, be.browseNum,bb.resourceType "
+
"bb.publishTime, bb.status,
bb.author, be.priceOption, be.price, be.realPrice, be.img
, be.bookStatus, be.browseNum,bb.resourceType "
+
"FROM res_book bb "
+
"FROM res_book bb "
+
"LEFT JOIN res_ebook be ON bb.id = be.id "
+
"LEFT JOIN res_ebook be ON bb.id = be.id "
+
"where be.bookStatus = 4 "
+
"where be.bookStatus = 4 "
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论