Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jgjy
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
jgjy
Commits
2f2f922b
提交
2f2f922b
authored
1月 16, 2020
作者:
zhouzhigang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
af3fa9c6
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
57 行增加
和
2 行删除
+57
-2
PhyResourceController.java
...e/controller/goods/phyresource/PhyResourceController.java
+10
-0
PhyResourceMapper.java
.../resource/mapper/goods/phyresource/PhyResourceMapper.java
+4
-0
PhyResourceService.java
...esource/service/goods/phyresource/PhyResourceService.java
+10
-0
PhyResourceServiceImpl.java
...rce/service/goods/phyresource/PhyResourceServiceImpl.java
+27
-1
TxAdviceInterceptor.java
...ava/com/zrqx/core/commons/aspect/TxAdviceInterceptor.java
+1
-1
BaseRequestPath.java
...src/main/java/com/zrqx/core/constant/BaseRequestPath.java
+2
-0
PhyResourcePageVo.java
...e/vo/resource/bg/goods/phyresource/PhyResourcePageVo.java
+3
-0
没有找到文件。
com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/controller/goods/phyresource/PhyResourceController.java
浏览文件 @
2f2f922b
...
...
@@ -102,6 +102,16 @@ public class PhyResourceController {
ExcelUtil
.
getInstance
().
exportExcel
(
copyList
,
ExportResourceExcel
.
class
,
"实体资源.xls"
,
response
,
request
);
return
null
;
}
@ApiOperation
(
value
=
"导出职教分社资源"
)
@GetMapping
(
value
=
ResourceRequestPath
.
ZJFS
+
ResourceRequestPath
.
PAGE
+
ResourceRequestPath
.
EXPORT
)
public
String
exportZjfsPage
(
HttpServletRequest
request
,
HttpServletResponse
response
)
throws
Exception
{
List
<
PhyResourcePageVo
>
list
=
phyResourceService
.
exportZjfsPage
();
List
<
ExportResourceExcel
>
copyList
=
BeanUtils
.
copyList
(
list
,
ExportResourceExcel
.
class
);
ExcelUtil
.
getInstance
().
exportExcel
(
copyList
,
ExportResourceExcel
.
class
,
"实体资源.xls"
,
response
,
request
);
return
null
;
}
@ApiOperation
(
value
=
"查看图书"
)
@GetMapping
(
ResourceRequestPath
.
GET_OID
)
...
...
com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/mapper/goods/phyresource/PhyResourceMapper.java
浏览文件 @
2f2f922b
...
...
@@ -234,5 +234,9 @@ public interface PhyResourceMapper extends BaseMapper<PhyResource> {
@Select
(
"SELECT * from res_physical_resource s where s.`status` = 3"
)
List
<
PhyResource
>
getList1
();
@Select
(
" SELECT * from res_physical_resource where (type = '1-4' or type = '1-1' or type = '1-3') and status = 3 "
)
List
<
PhyResourcePageVo
>
getZjfsList
();
}
com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/service/goods/phyresource/PhyResourceService.java
浏览文件 @
2f2f922b
...
...
@@ -279,6 +279,16 @@ public interface PhyResourceService extends BaseService<PhyResource, String> {
/**
* 导出职教分社实体资源跟自定义分类
* @param pageParam
* @return
* @auther zzg
* @data 2019年11月12日 下午3:10:26
*/
List
<
PhyResourcePageVo
>
exportZjfsPage
();
/**
* 导出重复的isbn
* @return
* @auther zzg
...
...
com.zrqx.bg.resource/src/main/java/com/zrqx/bg/resource/service/goods/phyresource/PhyResourceServiceImpl.java
浏览文件 @
2f2f922b
...
...
@@ -289,7 +289,7 @@ public class PhyResourceServiceImpl extends BaseModelServiceImpl<PhyResource, St
List
<
PhyResourcePageVo
>
phyResourcePageVos
=
phyResourceMapper
.
page
(
query
);
for
(
PhyResourcePageVo
vo
:
phyResourcePageVos
){
GoodsDiyTypeRelation
record
=
new
GoodsDiyTypeRelation
();
record
.
setGoodsid
(
String
.
valueOf
(
vo
.
getId
()
));
record
.
setGoodsid
(
vo
.
getId
(
));
List
<
GoodsDiyTypeRelation
>
goodsDiyTypeRelations
=
goodsDiyTypeRelationMapper
.
select
(
record
);
StringBuffer
oneDiyTypes
=
new
StringBuffer
();
//一级分类
StringBuffer
twoDiyTypes
=
new
StringBuffer
();
//二级分类
...
...
@@ -879,6 +879,32 @@ public class PhyResourceServiceImpl extends BaseModelServiceImpl<PhyResource, St
}
@Override
public
List
<
PhyResourcePageVo
>
exportZjfsPage
()
{
List
<
PhyResourcePageVo
>
list
=
phyResourceMapper
.
getZjfsList
();
list
.
forEach
(
vo
->{
if
(
StringUtils
.
isNotEmpty
(
vo
.
getCover
())){
vo
.
setCover
(
"有"
);
}
else
{
vo
.
setCover
(
"无"
);
vo
.
setRemark
(
"补全封面"
);
}
Map
<
Integer
,
String
>
diyTypesName
=
diyTypeManage
.
getDiyTypesName
(
vo
.
getId
());
if
(
diyTypesName
!=
null
){
diyTypesName
.
forEach
((
k
,
v
)
->{
vo
.
setDiyType
(
v
);
});
}
});
return
list
;
}
public
List
<
Integer
>
formatLable
(
String
type
){
List
<
Integer
>
list
=
new
ArrayList
<
Integer
>();
if
(
GoodsTypeEnum
.
JCK
.
getCode
().
equals
(
type
))
{
//教参
...
...
com.zrqx.core/src/main/java/com/zrqx/core/commons/aspect/TxAdviceInterceptor.java
浏览文件 @
2f2f922b
...
...
@@ -34,7 +34,7 @@ import org.springframework.transaction.interceptor.TransactionInterceptor;
@Configuration
public
class
TxAdviceInterceptor
{
private
static
final
int
TX_METHOD_TIMEOUT
=
120
;
private
static
final
int
TX_METHOD_TIMEOUT
=
120
000
;
private
static
final
int
TX_METHOD_TIMEOUT_PUSH_BAISHI
=
3600
;
public
static
final
String
AOP_POINTCUT_EXPRESSION
=
"(execution(* com.zrqx..service..*Impl.*(..)))"
;
...
...
com.zrqx.core/src/main/java/com/zrqx/core/constant/BaseRequestPath.java
浏览文件 @
2f2f922b
...
...
@@ -219,5 +219,7 @@ public class BaseRequestPath {
public
static
final
String
LOGO
=
"/logo"
;
/** 日志*/
public
static
final
String
LOG
=
"/log"
;
/** 职教分社*/
public
static
final
String
ZJFS
=
"/zjfs"
;
}
com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/bg/goods/phyresource/PhyResourcePageVo.java
浏览文件 @
2f2f922b
...
...
@@ -48,6 +48,9 @@ public class PhyResourcePageVo {
private
String
threeDiyType
;
@ApiModelProperty
(
"是否跟教材有关联"
)
private
String
isRelation
;
@ApiModelProperty
(
"备注"
)
private
String
remark
;
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论