Skip to content

L
lwby_copyright_book_data
Commit e4354496 authored by maliang's avatar maliang
Browse files
Options

上传bug修复

parent 40c9046b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1641 additions and 136 deletions
logs/admin-server.log
View file @ e4354496
This source diff could not be displayed because it is too large. You can view the blob instead.
logs/admin-server.log.error
View file @ e4354496
2020-04-17 16:33:24,084 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:33:24,224 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:33:24,240 [localhost-startStop-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:34:25,231 [http-nio-8089-exec-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:34:25,432 [http-nio-8089-exec-4] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:34:38,761 [http-nio-8089-exec-3] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:34:38,764 [http-nio-8089-exec-5] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:34:38,765 [http-nio-8089-exec-6] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:34:38,766 [http-nio-8089-exec-4] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:44:54,814 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:44:54,939 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:44:54,970 [localhost-startStop-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:45:57,486 [http-nio-8089-exec-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-04-17 16:45:57,677 [http-nio-8089-exec-4] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:25,767 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:26,001 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:26,024 [localhost-startStop-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:53,862 [http-nio-8091-exec-7] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:54,069 [http-nio-8091-exec-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:54,070 [http-nio-8091-exec-10] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:54,073 [http-nio-8091-exec-5] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:54,074 [http-nio-8091-exec-4] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:11:54,075 [http-nio-8091-exec-9] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:09,313 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:09,452 [main] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:09,474 [localhost-startStop-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:36,703 [http-nio-8091-exec-1] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:36,856 [http-nio-8091-exec-3] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:36,857 [http-nio-8091-exec-4] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:36,861 [http-nio-8091-exec-5] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:36,862 [http-nio-8091-exec-8] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
2020-05-27 20:32:36,863 [http-nio-8091-exec-6] ERROR o.a.c.core.AprLifecycleListener -[DirectJDKLog.java:180]- An incompatible version [1.2.12] of the APR based Apache Tomcat Native library is installed, while Tomcat requires version [1.2.14]
logs/admin-server.log.sql
View file @ e4354496
This diff is collapsed.
src/main/java/com/boot/security/server/controller/CopyrightBookController.java
View file @ e4354496
......@@ -23,6 +23,13 @@ public class CopyrightBookController {
return copyrightBookService.selectSettlement(request.getCopyrightIds(),request.getPage(),request.getLimit());
}
// @PostMapping("/exportSettlementMonth")
// @ApiOperation(value = "获取月结算数据")
// @ResponseBody
// public String exportSettlementMonth(@RequestBody PageTableRequest request) {
// return copyrightBookService.selectSettlement(null,null,null);
// }
@PostMapping("/settlementBookMonth")
@ApiOperation(value = "获取书籍月结算数据")
@ResponseBody
......
src/main/resources/mybatis-mappers/CopyrightMapper.xml
View file @ e4354496
......@@ -39,7 +39,9 @@
and a.release_status = #{status}
</if>
ORDER BY a.report_date DESC
limit #{page},#{limit};
<if test="page != null and page!='' ">
limit #{page},#{limit};
</if>
</select>
<select id="selectTableListMonthCount" resultType="Integer" parameterType="com.boot.security.server.model.BaseSettlement">
......
src/main/resources/static/pages/copyrightBookData/bookInfo.html
View file @ e4354496
......@@ -51,6 +51,8 @@
,page: true
,toolbar:'true'
,defaultToolbar: ['exports']
,limits:[20,30,40,50,60,70,80,90,40000]
,height:500
,cols: [[
{field: 'bookId', title: '必看bookId',fixed:'left'}
,{field: 'cpId', title: 'CPookId'}
......
src/main/resources/static/pages/copyrightBookData/bookMonthDetail.html
View file @ e4354496
......@@ -96,6 +96,8 @@
,page: true
,toolbar:'true'
,defaultToolbar: ['exports']
,limits:[20,30,40,50,60,70,80,90,30000]
,height:500
,cols: [[
{field: 'reportDate', title: '日期', sort: true,fixed:'left'}
,{field: 'bookId', title: 'cpId'}
......
src/main/resources/static/pages/copyrightBookData/copyrightMonthSettlement.html
View file @ e4354496
......@@ -20,6 +20,11 @@
<div class="layui-col-md4">
<span style="float: right;color: #ed1c24;" id="schema"></span>
</div>
<!--<div class="layui-col-md3">-->
<!--<button id="export" type="button" class="layui-btn" style="float:right;">-->
<!--<i class="layui-icon layui-icon-export"></i>导出-->
<!--</button>-->
<!--</div>-->
</div>
<div class="layui-row">
<table class="layui-table" id="copyrightMonth_table" lay-filter="test">
......@@ -67,6 +72,8 @@
, page: true
, toolbar: 'true'
, defaultToolbar: ['exports']
,limits:[20,30,40,50,60,70,80,90,400]
,height:500
, cols: [[
{field: 'reportDate', title: '日期', sort: true, fixed: 'left'}
, {field: 'totalAmount', title: '销售金额'}
......@@ -92,6 +99,8 @@
,page: true
,toolbar:'true'
,defaultToolbar: ['exports']
,limits:[20,30,40,50,60,70,80,90,400]
,height:500
,cols: [[
{field: 'reportDate', title: '日期', sort: true,fixed:'left'}
,{field: 'copyrightId', title: '版权费id', hide: true}
......@@ -212,7 +221,18 @@
});
}
// $('#export').bind('click',function(){
// exportAllData();
// });
//
// function exportAllData(){
// var table = layui.table;
// table.exportFile(['名字','性别','年龄'], [
// ['张三','男','20'],
// ['李四','女','18'],
// ['王五','女','19']
// ], 'xls');
// }
layui.use('form', function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment