Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nrgl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
nrgl
Commits
84bfe1fe
提交
84bfe1fe
authored
5月 24, 2019
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
09585f64
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
29 行增加
和
31 行删除
+29
-31
BatchUpdateAudioLibraryForm.java
...resource/bg/audiolibrary/BatchUpdateAudioLibraryForm.java
+5
-3
SaveUpdateClauseLibraryForm.java
...esource/bg/clauseLibrary/SaveUpdateClauseLibraryForm.java
+1
-1
BatchUpdateCoursewareLibraryForm.java
...g/coursewarelibrary/BatchUpdateCoursewareLibraryForm.java
+5
-3
BatchUpdateImageLibraryForm.java
...resource/bg/imagelibrary/BatchUpdateImageLibraryForm.java
+5
-3
BatchUpdatePdfLibraryForm.java
...orm/resource/bg/pdflibrary/BatchUpdatePdfLibraryForm.java
+5
-3
BatchUpdateVideoLibraryForm.java
...resource/bg/videolibrary/BatchUpdateVideoLibraryForm.java
+2
-1
ClauseLibrary.java
...zrqx/core/model/resource/clauseLibrary/ClauseLibrary.java
+1
-1
AudioLibraryController.java
...ce/bg/controller/audiolibrary/AudioLibraryController.java
+1
-1
CoursewareLibraryController.java
...roller/coursewarelibrary/CoursewareLibraryController.java
+1
-1
ImageLibraryController.java
...ce/bg/controller/imagelibrary/ImageLibraryController.java
+1
-1
PdfLibraryController.java
...source/bg/controller/pdflibrary/PdfLibraryController.java
+1
-1
SeriesController.java
.../zrqx/resource/bg/controller/series/SeriesController.java
+0
-11
VideoLibraryController.java
...ce/bg/controller/videolibrary/VideoLibraryController.java
+1
-1
没有找到文件。
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/audiolibrary/BatchUpdateAudioLibraryForm.java
浏览文件 @
84bfe1fe
package
com
.
zrqx
.
core
.
form
.
resource
.
bg
.
audiolibrary
;
package
com
.
zrqx
.
core
.
form
.
resource
.
bg
.
audiolibrary
;
import
java.util.List
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"BatchUpdateAudioLibraryForm"
,
description
=
"批量修改音频"
)
@ApiModel
(
value
=
"BatchUpdateAudioLibraryForm"
,
description
=
"批量修改音频"
)
...
@@ -17,7 +19,7 @@ public class BatchUpdateAudioLibraryForm {
...
@@ -17,7 +19,7 @@ public class BatchUpdateAudioLibraryForm {
@ApiModelProperty
(
value
=
"自定义分类code"
)
@ApiModelProperty
(
value
=
"自定义分类code"
)
private
List
<
String
>
diyTypeCode
;
private
List
<
String
>
diyTypeCode
;
@ApiModelProperty
(
"售价 "
)
@ApiModelProperty
(
"售价 "
)
private
String
sellingPrice
;
private
BigDecimal
sellingPrice
;
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
private
Integer
priceType
;
private
Integer
priceType
;
}
}
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/clauseLibrary/SaveUpdateClauseLibraryForm.java
浏览文件 @
84bfe1fe
...
@@ -38,7 +38,7 @@ public class SaveUpdateClauseLibraryForm {
...
@@ -38,7 +38,7 @@ public class SaveUpdateClauseLibraryForm {
@ApiModelProperty
(
"所属部门"
)
@ApiModelProperty
(
"所属部门"
)
private
String
department
;
private
String
department
;
@ApiModelProperty
(
"所属部门"
)
@ApiModelProperty
(
"所属部门"
)
private
String
departmentId
;
private
Integer
departmentId
;
@ApiModelProperty
(
"关键词"
)
@ApiModelProperty
(
"关键词"
)
private
String
keyword
;
private
String
keyword
;
@ApiModelProperty
(
"PDF"
)
@ApiModelProperty
(
"PDF"
)
...
...
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/coursewarelibrary/BatchUpdateCoursewareLibraryForm.java
浏览文件 @
84bfe1fe
package
com
.
zrqx
.
core
.
form
.
resource
.
bg
.
coursewarelibrary
;
package
com
.
zrqx
.
core
.
form
.
resource
.
bg
.
coursewarelibrary
;
import
java.util.List
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"BatchUpdateCoursewareLibraryForm"
,
description
=
"批量修改课件"
)
@ApiModel
(
value
=
"BatchUpdateCoursewareLibraryForm"
,
description
=
"批量修改课件"
)
...
@@ -17,7 +19,7 @@ public class BatchUpdateCoursewareLibraryForm {
...
@@ -17,7 +19,7 @@ public class BatchUpdateCoursewareLibraryForm {
@ApiModelProperty
(
"自定义分类code"
)
@ApiModelProperty
(
"自定义分类code"
)
private
List
<
String
>
diyTypeCode
;
private
List
<
String
>
diyTypeCode
;
@ApiModelProperty
(
"售价 "
)
@ApiModelProperty
(
"售价 "
)
private
String
sellingPrice
;
private
BigDecimal
sellingPrice
;
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
private
Integer
priceType
;
private
Integer
priceType
;
}
}
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/imagelibrary/BatchUpdateImageLibraryForm.java
浏览文件 @
84bfe1fe
package
com
.
zrqx
.
core
.
form
.
resource
.
bg
.
imagelibrary
;
package
com
.
zrqx
.
core
.
form
.
resource
.
bg
.
imagelibrary
;
import
java.util.List
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"BatchUpdateImageLibraryForm"
,
description
=
"批量修改图片"
)
@ApiModel
(
value
=
"BatchUpdateImageLibraryForm"
,
description
=
"批量修改图片"
)
...
@@ -17,7 +19,7 @@ public class BatchUpdateImageLibraryForm {
...
@@ -17,7 +19,7 @@ public class BatchUpdateImageLibraryForm {
@ApiModelProperty
(
"自定义分类code"
)
@ApiModelProperty
(
"自定义分类code"
)
private
List
<
String
>
diyTypeCode
;
private
List
<
String
>
diyTypeCode
;
@ApiModelProperty
(
"售价 "
)
@ApiModelProperty
(
"售价 "
)
private
String
sellingPrice
;
private
BigDecimal
sellingPrice
;
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
private
Integer
priceType
;
private
Integer
priceType
;
...
...
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/pdflibrary/BatchUpdatePdfLibraryForm.java
浏览文件 @
84bfe1fe
package
com
.
zrqx
.
core
.
form
.
resource
.
bg
.
pdflibrary
;
package
com
.
zrqx
.
core
.
form
.
resource
.
bg
.
pdflibrary
;
import
java.util.List
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
lombok.Data
;
import
lombok.Data
;
@Data
@Data
@ApiModel
(
value
=
"BatchUpdatePdfLibraryForm"
,
description
=
"批量修改pdf"
)
@ApiModel
(
value
=
"BatchUpdatePdfLibraryForm"
,
description
=
"批量修改pdf"
)
...
@@ -17,7 +19,7 @@ public class BatchUpdatePdfLibraryForm {
...
@@ -17,7 +19,7 @@ public class BatchUpdatePdfLibraryForm {
@ApiModelProperty
(
value
=
"自定义分类code"
)
@ApiModelProperty
(
value
=
"自定义分类code"
)
private
List
<
String
>
diyTypeCode
;
private
List
<
String
>
diyTypeCode
;
@ApiModelProperty
(
"售价 "
)
@ApiModelProperty
(
"售价 "
)
private
String
sellingPrice
;
private
BigDecimal
sellingPrice
;
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
private
Integer
priceType
;
private
Integer
priceType
;
}
}
com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/videolibrary/BatchUpdateVideoLibraryForm.java
浏览文件 @
84bfe1fe
...
@@ -3,6 +3,7 @@ package com.zrqx.core.form.resource.bg.videolibrary;
...
@@ -3,6 +3,7 @@ package com.zrqx.core.form.resource.bg.videolibrary;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.List
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -19,7 +20,7 @@ public class BatchUpdateVideoLibraryForm {
...
@@ -19,7 +20,7 @@ public class BatchUpdateVideoLibraryForm {
@ApiModelProperty
(
value
=
"自定义分类code"
)
@ApiModelProperty
(
value
=
"自定义分类code"
)
private
List
<
String
>
diyTypeCode
;
private
List
<
String
>
diyTypeCode
;
@ApiModelProperty
(
"售价 "
)
@ApiModelProperty
(
"售价 "
)
private
String
sellingPrice
;
private
BigDecimal
sellingPrice
;
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
@ApiModelProperty
(
"价格状态 1:付费 2:免费"
)
private
Integer
priceType
;
private
Integer
priceType
;
...
...
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/clauseLibrary/ClauseLibrary.java
浏览文件 @
84bfe1fe
...
@@ -46,7 +46,7 @@ public class ClauseLibrary {
...
@@ -46,7 +46,7 @@ public class ClauseLibrary {
@ApiModelProperty
(
"所属部门"
)
@ApiModelProperty
(
"所属部门"
)
private
String
department
;
private
String
department
;
@ApiModelProperty
(
"所属部门"
)
@ApiModelProperty
(
"所属部门"
)
private
String
departmentId
;
private
Integer
departmentId
;
@ApiModelProperty
(
"关键词"
)
@ApiModelProperty
(
"关键词"
)
private
String
keyword
;
private
String
keyword
;
@ApiModelProperty
(
"PDF"
)
@ApiModelProperty
(
"PDF"
)
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/audiolibrary/AudioLibraryController.java
浏览文件 @
84bfe1fe
...
@@ -103,7 +103,7 @@ public class AudioLibraryController {
...
@@ -103,7 +103,7 @@ public class AudioLibraryController {
cr
.
andEqualTo
(
"objectId"
,
str
);
cr
.
andEqualTo
(
"objectId"
,
str
);
AudioGoods
entity
=
audioGoodsService
.
selectOneByCriteria
();
AudioGoods
entity
=
audioGoodsService
.
selectOneByCriteria
();
if
(
entity
!=
null
){
if
(
entity
!=
null
){
entity
.
setSellingPrice
(
new
BigDecimal
(
form
.
getSellingPrice
()
));
entity
.
setSellingPrice
(
form
.
getSellingPrice
(
));
entity
.
setPriceType
(
form
.
getPriceType
());
entity
.
setPriceType
(
form
.
getPriceType
());
audioGoodsService
.
updateByCriteria
(
entity
);
audioGoodsService
.
updateByCriteria
(
entity
);
}
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/coursewarelibrary/CoursewareLibraryController.java
浏览文件 @
84bfe1fe
...
@@ -102,7 +102,7 @@ public class CoursewareLibraryController {
...
@@ -102,7 +102,7 @@ public class CoursewareLibraryController {
cr
.
andEqualTo
(
"objectId"
,
str
);
cr
.
andEqualTo
(
"objectId"
,
str
);
CoursewareGoods
entity
=
goodsService
.
selectOneByCriteria
();
CoursewareGoods
entity
=
goodsService
.
selectOneByCriteria
();
if
(
entity
!=
null
){
if
(
entity
!=
null
){
entity
.
setSellingPrice
(
new
BigDecimal
(
form
.
getSellingPrice
()
));
entity
.
setSellingPrice
(
form
.
getSellingPrice
(
));
entity
.
setPriceType
(
form
.
getPriceType
());
entity
.
setPriceType
(
form
.
getPriceType
());
goodsService
.
updateByCriteria
(
entity
);
goodsService
.
updateByCriteria
(
entity
);
}
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/imagelibrary/ImageLibraryController.java
浏览文件 @
84bfe1fe
...
@@ -108,7 +108,7 @@ public class ImageLibraryController {
...
@@ -108,7 +108,7 @@ public class ImageLibraryController {
cr
.
andEqualTo
(
"objectId"
,
str
);
cr
.
andEqualTo
(
"objectId"
,
str
);
ImageGoods
entity
=
goodsService
.
selectOneByCriteria
();
ImageGoods
entity
=
goodsService
.
selectOneByCriteria
();
if
(
entity
!=
null
){
if
(
entity
!=
null
){
entity
.
setSellingPrice
(
new
BigDecimal
(
form
.
getSellingPrice
()
));
entity
.
setSellingPrice
(
form
.
getSellingPrice
(
));
entity
.
setPriceType
(
form
.
getPriceType
());
entity
.
setPriceType
(
form
.
getPriceType
());
goodsService
.
updateByCriteria
(
entity
);
goodsService
.
updateByCriteria
(
entity
);
}
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/pdflibrary/PdfLibraryController.java
浏览文件 @
84bfe1fe
...
@@ -102,7 +102,7 @@ public class PdfLibraryController {
...
@@ -102,7 +102,7 @@ public class PdfLibraryController {
cr
.
andEqualTo
(
"objectId"
,
str
);
cr
.
andEqualTo
(
"objectId"
,
str
);
PdfGoods
entity
=
goodsService
.
selectOneByCriteria
();
PdfGoods
entity
=
goodsService
.
selectOneByCriteria
();
if
(
entity
!=
null
){
if
(
entity
!=
null
){
entity
.
setSellingPrice
(
new
BigDecimal
(
form
.
getSellingPrice
()
));
entity
.
setSellingPrice
(
form
.
getSellingPrice
(
));
entity
.
setPriceType
(
form
.
getPriceType
());
entity
.
setPriceType
(
form
.
getPriceType
());
goodsService
.
updateByCriteria
(
entity
);
goodsService
.
updateByCriteria
(
entity
);
}
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/series/SeriesController.java
浏览文件 @
84bfe1fe
...
@@ -119,17 +119,6 @@ public class SeriesController {
...
@@ -119,17 +119,6 @@ public class SeriesController {
return
CallBack
.
success
(
service
.
selectAll
());
return
CallBack
.
success
(
service
.
selectAll
());
}
}
@ApiOperation
(
value
=
"名字是否已存在"
,
notes
=
"名字是否已存在"
)
@GetMapping
(
value
=
ResourceRequestPath
.
ISEXIST
)
public
CallBack
<
Boolean
>
isExist
(
String
name
)
{
service
.
createCriteria
().
andEqualTo
(
"seriesName"
,
name
);
Series
series
=
service
.
selectOneByCriteria
();
if
(
series
!=
null
){
throw
new
BaseException
(
ResponseCodeEnum
.
REPEST
);
}
return
CallBack
.
success
();
}
@ApiOperation
(
value
=
"批量导入丛书"
,
notes
=
"批量导入丛书"
)
@ApiOperation
(
value
=
"批量导入丛书"
,
notes
=
"批量导入丛书"
)
@PostMapping
(
value
=
ResourceRequestPath
.
IMPORT
,
produces
=
"application/json;charset=UTF-8"
)
@PostMapping
(
value
=
ResourceRequestPath
.
IMPORT
,
produces
=
"application/json;charset=UTF-8"
)
public
CallBack
<
String
>
importSeries
(
@RequestParam
(
"file"
)
MultipartFile
file
)
throws
Exception
{
public
CallBack
<
String
>
importSeries
(
@RequestParam
(
"file"
)
MultipartFile
file
)
throws
Exception
{
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/videolibrary/VideoLibraryController.java
浏览文件 @
84bfe1fe
...
@@ -105,7 +105,7 @@ public class VideoLibraryController {
...
@@ -105,7 +105,7 @@ public class VideoLibraryController {
cr
.
andEqualTo
(
"objectId"
,
str
);
cr
.
andEqualTo
(
"objectId"
,
str
);
VideoGoods
entity
=
goodsService
.
selectOneByCriteria
();
VideoGoods
entity
=
goodsService
.
selectOneByCriteria
();
if
(
entity
!=
null
){
if
(
entity
!=
null
){
entity
.
setSellingPrice
(
new
BigDecimal
(
form
.
getSellingPrice
()
));
entity
.
setSellingPrice
(
form
.
getSellingPrice
(
));
entity
.
setPriceType
(
form
.
getPriceType
());
entity
.
setPriceType
(
form
.
getPriceType
());
goodsService
.
updateByCriteria
(
entity
);
goodsService
.
updateByCriteria
(
entity
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论