Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nrgl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
nrgl
Commits
a5d851b2
提交
a5d851b2
authored
2月 20, 2019
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
3f781a98
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
23 行增加
和
7 行删除
+23
-7
EbookLibraryController.java
...ce/bg/controller/ebooklibrary/EbookLibraryController.java
+15
-3
RecycleBinController.java
...source/bg/controller/recycleBin/RecycleBinController.java
+8
-3
RecycleBinResourceService.java
...urce/bg/service/recycleBin/RecycleBinResourceService.java
+0
-1
没有找到文件。
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebooklibrary/EbookLibraryController.java
浏览文件 @
a5d851b2
...
@@ -11,6 +11,9 @@ import java.util.Iterator;
...
@@ -11,6 +11,9 @@ import java.util.Iterator;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -481,7 +484,7 @@ public class EbookLibraryController {
...
@@ -481,7 +484,7 @@ public class EbookLibraryController {
});
});
return
null
;
return
null
;
}
}
/*
@ApiOperation(value = "导出图书Excel")
@ApiOperation
(
value
=
"导出图书Excel"
)
@GetMapping
(
value
=
SysUserRequestPath
.
EXPORT
)
@GetMapping
(
value
=
SysUserRequestPath
.
EXPORT
)
public
String
exportCard
(
QueryEbookForm
form
,
PageParam
pageParam
,
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
public
String
exportCard
(
QueryEbookForm
form
,
PageParam
pageParam
,
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
Criteria
cr
=
bookservice
.
createCriteria
();
Criteria
cr
=
bookservice
.
createCriteria
();
...
@@ -491,13 +494,22 @@ public class EbookLibraryController {
...
@@ -491,13 +494,22 @@ public class EbookLibraryController {
if
(
StringUtils
.
isNotBlank
(
form
.
getAuthor
()))
{
if
(
StringUtils
.
isNotBlank
(
form
.
getAuthor
()))
{
cr
.
andLike
(
"author"
,
"%"
+
form
.
getAuthor
()
+
"%"
);
cr
.
andLike
(
"author"
,
"%"
+
form
.
getAuthor
()
+
"%"
);
}
}
List<Card> list = service.queryCriteria(pageParam).getList();
if
(
StringUtils
.
isNotBlank
(
form
.
getIsbn
()))
{
cr
.
andLike
(
"isbn"
,
"%"
+
form
.
getIsbn
()
+
"%"
);
}
if
(
StringUtils
.
isNotBlank
(
form
.
getEdition
()))
{
cr
.
andLike
(
"edition"
,
"%"
+
form
.
getEdition
()
+
"%"
);
}
if
(
StringUtils
.
isNotBlank
(
form
.
getExecutiveEditor
()))
{
cr
.
andLike
(
"executiveEditor"
,
"%"
+
form
.
getExecutiveEditor
()
+
"%"
);
}
List
<
Book
>
list
=
bookservice
.
queryCriteria
(
pageParam
).
getList
();
List
<
ExcelBookVO
>
voList
=
Copy
.
copyList
(
list
,
ExcelBookVO
.
class
);
List
<
ExcelBookVO
>
voList
=
Copy
.
copyList
(
list
,
ExcelBookVO
.
class
);
ExcelUtil
.
getInstance
().
exportExcel
(
voList
,
ExcelBookVO
.
class
,
"图书信息模板.xls"
,
response
,
request
);
ExcelUtil
.
getInstance
().
exportExcel
(
voList
,
ExcelBookVO
.
class
,
"图书信息模板.xls"
,
response
,
request
);
return
null
;
return
null
;
}
*/
}
@ApiOperation
(
value
=
"添加附件"
,
notes
=
"添加附件"
)
@ApiOperation
(
value
=
"添加附件"
,
notes
=
"添加附件"
)
@PostMapping
(
value
=
ResourceRequestPath
.
SAVE_ATTACHMENT
)
@PostMapping
(
value
=
ResourceRequestPath
.
SAVE_ATTACHMENT
)
public
CallBack
<
String
>
addAttachment
(
String
bookid
,
String
token
){
public
CallBack
<
String
>
addAttachment
(
String
bookid
,
String
token
){
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recycleBin/RecycleBinController.java
浏览文件 @
a5d851b2
...
@@ -589,10 +589,15 @@ public class RecycleBinController {
...
@@ -589,10 +589,15 @@ public class RecycleBinController {
@GetMapping
(
value
=
SysUserRequestPath
.
EXPORT
)
@GetMapping
(
value
=
SysUserRequestPath
.
EXPORT
)
public
String
exportCard
(
QueryResourceRelationForm
form
,
PageParam
pageParam
,
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
public
String
exportCard
(
QueryResourceRelationForm
form
,
PageParam
pageParam
,
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
Criteria
cr
=
resourceService
.
createCriteria
();
Criteria
cr
=
resourceService
.
createCriteria
();
if
(
StringUtils
.
isNotBlank
(
form
.
getResourceType
().
toString
()))
{
if
(
form
.
getResourceType
()
!=
null
)
{
cr
.
andLike
(
"resourceType"
,
""
+
form
.
getResourceType
()
+
""
);
cr
.
andEqualTo
(
"resourceType"
,
form
.
getResourceType
());
}
if
(
StringUtils
.
isNotBlank
(
form
.
getBeginTime
()))
{
cr
.
andEqualTo
(
"createTime >"
,
form
.
getBeginTime
());
}
if
(
StringUtils
.
isNotBlank
(
form
.
getEndTime
()))
{
cr
.
andEqualTo
(
"createTime <"
,
form
.
getEndTime
());
}
}
List
<
RecycleBinResource
>
list
=
resourceService
.
queryCriteria
(
pageParam
).
getList
();
List
<
RecycleBinResource
>
list
=
resourceService
.
queryCriteria
(
pageParam
).
getList
();
List
<
ExcleRecycleBinVo
>
voList
=
Copy
.
copyList
(
list
,
ExcleRecycleBinVo
.
class
);
List
<
ExcleRecycleBinVo
>
voList
=
Copy
.
copyList
(
list
,
ExcleRecycleBinVo
.
class
);
ExcelUtil
.
getInstance
().
exportExcel
(
voList
,
ExcleRecycleBinVo
.
class
,
"回收站资源.xls"
,
response
,
request
);
ExcelUtil
.
getInstance
().
exportExcel
(
voList
,
ExcleRecycleBinVo
.
class
,
"回收站资源.xls"
,
response
,
request
);
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/recycleBin/RecycleBinResourceService.java
浏览文件 @
a5d851b2
...
@@ -3,7 +3,6 @@ package com.zrqx.resource.bg.service.recycleBin;
...
@@ -3,7 +3,6 @@ package com.zrqx.resource.bg.service.recycleBin;
import
java.util.List
;
import
java.util.List
;
import
com.zrqx.core.form.resource.bg.QueryResourceRelationForm
;
import
com.zrqx.core.form.resource.bg.QueryResourceRelationForm
;
import
com.zrqx.core.model.resource.pdffilelibrary.PdfResource
;
import
com.zrqx.core.model.resource.recycleBin.RecycleBinResource
;
import
com.zrqx.core.model.resource.recycleBin.RecycleBinResource
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.core.util.PageParam
;
import
com.zrqx.core.util.PageParam
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论