Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nrgl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
nrgl
Commits
dd91019b
提交
dd91019b
authored
5月 13, 2019
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
33dc05b3
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
6 行增加
和
4 行删除
+6
-4
ResourceRecycleBinListVO.java
...core/vo/resource/recycleBin/ResourceRecycleBinListVO.java
+2
-0
RecycleBinMapper.java
.../zrqx/resource/bg/mapper/recycleBin/RecycleBinMapper.java
+4
-4
没有找到文件。
com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/recycleBin/ResourceRecycleBinListVO.java
浏览文件 @
dd91019b
...
@@ -27,4 +27,6 @@ public class ResourceRecycleBinListVO {
...
@@ -27,4 +27,6 @@ public class ResourceRecycleBinListVO {
private
Integer
status
;
private
Integer
status
;
@ApiModelProperty
(
"封面"
)
@ApiModelProperty
(
"封面"
)
private
String
cover
;
private
String
cover
;
@ApiModelProperty
(
"资源类型 1图书库 2文章库 3期刊库 4论文库 5图片库 6视频库 7音频库 8动画库 9课件库 10法规库 11标准库 12专利库 13成果库 14条文库 15PDF 16专家库 "
)
private
Integer
resourceType
;
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/recycleBin/RecycleBinMapper.java
浏览文件 @
dd91019b
...
@@ -19,12 +19,12 @@ import com.zrqx.core.vo.resource.recycleBin.ResourceRecycleBinListVO;
...
@@ -19,12 +19,12 @@ import com.zrqx.core.vo.resource.recycleBin.ResourceRecycleBinListVO;
public
interface
RecycleBinMapper
extends
BaseMapper
<
RecycleBin
>
{
public
interface
RecycleBinMapper
extends
BaseMapper
<
RecycleBin
>
{
@Select
(
"<script>"
@Select
(
"<script>"
+
"<if test='form.diyTypeCode == null'>"
+
"<if test='form.diyTypeCode == null'>"
+
"select distinct a.id,a.name,a.author,a.priceType,a.sellingPrice,a.objectId,"
+
"select distinct a.id,a.name,a.author,a.priceType,a.sellingPrice,a.objectId,
a.resourceType,
"
+
"DATE_FORMAT(a.createTime,'%Y-%m-%d %H:%i:%s') createTime,a.status from res_recycle_bin a "
+
"DATE_FORMAT(a.createTime,'%Y-%m-%d %H:%i:%s') createTime,a.status from res_recycle_bin a "
+
"where 1=1 "
+
"where 1=1 "
+
"</if>"
+
"</if>"
+
"<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"
+
"<if test='form.diyTypeCode != null and form.diyTypeCode != \"\"'>"
+
"select distinct a.id,a.name,a.author,a.priceType,a.sellingPrice,a.objectId,"
+
"select distinct a.id,a.name,a.author,a.priceType,a.sellingPrice,a.objectId,
a.resourceType,
"
+
"DATE_FORMAT(a.createTime,'%Y-%m-%d %H:%i:%s') createTime,a.status from res_recycle_bin a "
+
"DATE_FORMAT(a.createTime,'%Y-%m-%d %H:%i:%s') createTime,a.status from res_recycle_bin a "
+
"INNER JOIN res_recycle_bin_Diy_Type ad on a.id = ad.rlid where 1=1 "
+
"INNER JOIN res_recycle_bin_Diy_Type ad on a.id = ad.rlid where 1=1 "
+
"</if>"
+
"</if>"
...
@@ -42,10 +42,10 @@ public interface RecycleBinMapper extends BaseMapper<RecycleBin> {
...
@@ -42,10 +42,10 @@ public interface RecycleBinMapper extends BaseMapper<RecycleBin> {
+
"and a.name like concat('%',#{form.name},'%') "
+
"and a.name like concat('%',#{form.name},'%') "
+
"</if>"
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(form.beginTime)'>"
+
"<if test = '"
+
NOTBLANK
+
"(form.beginTime)'>"
+
"and a.createTime >= concat(#{form.beginTime}, '
00:00:00' )"
+
"and a.createTime >= concat(#{form.beginTime}, '00:00:00' )"
+
"</if>"
+
"</if>"
+
"<if test = '"
+
NOTBLANK
+
"(form.endTime)'>"
+
"<if test = '"
+
NOTBLANK
+
"(form.endTime)'>"
+
"and a.createTime <= concat(#{form.endTime}, '
23:59:59')"
+
"and a.createTime <= concat(#{form.endTime}, '23:59:59')"
+
"</if>"
+
"</if>"
+
"</script>"
)
+
"</script>"
)
List
<
ResourceRecycleBinListVO
>
query
(
@Param
(
"form"
)
QueryRecycleBinForm
form
);
List
<
ResourceRecycleBinListVO
>
query
(
@Param
(
"form"
)
QueryRecycleBinForm
form
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论