Commit 676d23d6 authored by maliang's avatar maliang

上传bug修复

parent 555e03ae
...@@ -285,6 +285,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService { ...@@ -285,6 +285,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
Integer status=null; Integer status=null;
List<BaseSettlement> baseSettlementList =new ArrayList<>(); List<BaseSettlement> baseSettlementList =new ArrayList<>();
if(copyrightId==null||copyrightId==0){ if(copyrightId==null||copyrightId==0){
System.out.println(copyrightId);
baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId()); baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
}else { }else {
BaseSettlement baseSettlement = new BaseSettlement(); BaseSettlement baseSettlement = new BaseSettlement();
......
...@@ -120,10 +120,10 @@ ...@@ -120,10 +120,10 @@
a.report_date>= '2020-04' and a.report_date <= #{endTime} a.report_date>= '2020-04' and a.report_date <= #{endTime}
]]> ]]>
<if test="bookId != null and bookId!='' "> <if test="bookId != null and bookId!='' ">
and b.book_id = #{bookId} and a.book_id = #{bookId}
</if> </if>
<if test=" bookName != null and bookName !='' "> <if test=" bookName != null and bookName !='' ">
and b.book_name like #{bookName} and a.book_name like #{bookName}
</if> </if>
<if test="copyrightIdList != null"> <if test="copyrightIdList != null">
and a.copyright_id in and a.copyright_id in
...@@ -142,10 +142,10 @@ ...@@ -142,10 +142,10 @@
a.report_date>= '2020-04' and a.report_date <= #{endTime} a.report_date>= '2020-04' and a.report_date <= #{endTime}
]]> ]]>
<if test="bookId != null and bookId!='' "> <if test="bookId != null and bookId!='' ">
and b.book_id = #{bookId} and a.book_id = #{bookId}
</if> </if>
<if test=" bookName != null and bookName !='' "> <if test=" bookName != null and bookName !='' ">
and b.book_name like #{bookName} and a.book_name like #{bookName}
</if> </if>
<if test="copyrightIdList != null"> <if test="copyrightIdList != null">
and a.copyright_id in and a.copyright_id in
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
,defaultToolbar: ['exports'] ,defaultToolbar: ['exports']
,cols: [[ ,cols: [[
{field: 'reportDate', title: '日期', sort: true,fixed:'left'} {field: 'reportDate', title: '日期', sort: true,fixed:'left'}
,{field: 'bookId', title: 'cpId', hide: true} ,{field: 'bookId', title: 'cpId'}
,{field: 'bookName', title: '书名'} ,{field: 'bookName', title: '书名'}
,{field: 'authors', title: '作者'} ,{field: 'authors', title: '作者'}
,{field: 'totalAmount', title: '销售金额'} ,{field: 'totalAmount', title: '销售金额'}
......
...@@ -274,6 +274,7 @@ ...@@ -274,6 +274,7 @@
} }
function setSchema(){ function setSchema(){
copyrights=copyrightId.val();
var list={copyrightIds:copyrights}; var list={copyrightIds:copyrights};
$.ajax({ $.ajax({
//请求方式 //请求方式
......
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