上传bug修复

src/main/java/com/boot/security/server/controller/CopyrightBookController.java

@@ -31,7 +31,7 @@ public class CopyrightBookController {
     }
 
     @PostMapping("/updateSettlementStatus")
-    @ApiOperation(value = "版权方数据")
+    @ApiOperation(value = "更新结算状态")
     public void updateSettlementStatus(@RequestBody PageTableRequest request){
         BaseSettlement baseSettlement = request.getBaseSettlement();
         copyrightDao.updateSettlementStatus(baseSettlement.getCopyrightId(),baseSettlement.getReportDate(),baseSettlement.getStatus(),baseSettlement.getStatusName());

src/main/java/com/boot/security/server/dao/CopyrightDao.java

@@ -3,6 +3,7 @@ package com.boot.security.server.dao;
 import com.boot.security.server.model.BaseSettlement;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -11,14 +12,17 @@ import java.util.List;
 public interface CopyrightDao {
     List<Long> selectUserAll();
 
-    List<BaseSettlement>  selectTableListMonth(@Param("copyrightId") Integer copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
+    List<BaseSettlement>  selectTableListMonth(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
 
-    Integer selectTableListMonthCount(@Param("copyrightId") Integer copyrightId);
+    Integer selectTableListMonthCount(@Param("copyrightId") List<BaseSettlement> copyrightId);
 
-    List<BaseSettlement> selectBookInfo(@Param("copyrightId") Integer copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
+    List<BaseSettlement> selectBookInfo(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
 
-    Integer selectBookInfoCount(@Param("copyrightId") Integer copyrightId);
+    Integer selectBookInfoCount(@Param("copyrightId") List<BaseSettlement> copyrightId);
 
+    List<BaseSettlement> selectCopyrightById(@Param("userId") Long userId);
+
+    @Select("SELECT a.copyright_id as copyrightId,a.copyright_name as copyrightName FROM bi_report.book_banquanweihu a group by a.copyright_id,a.copyright_name")
     List<BaseSettlement> selectCopyrightAll();
 
     List<BaseSettlement> selectBookDetail(@Param("copyrightIdList") List<BaseSettlement> copyrightIdList,@Param("bookId") Long bookId,@Param("bookName") String bookName);

src/main/java/com/boot/security/server/service/impl/CopyrightBookServiceImpl.java

@@ -5,10 +5,12 @@ import com.boot.security.server.dao.CopyrightDao;
 import com.boot.security.server.model.BaseSettlement;
 import com.boot.security.server.page.table.PageTableHandler;
 import com.boot.security.server.service.CopyrightBookService;
+import com.boot.security.server.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -17,10 +19,15 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
     CopyrightDao copyrightDao;
     @Override
     public String selectSettlement(Integer copyrightId,Integer page,Integer limit) {
+        List<BaseSettlement> baseSettlementList =new ArrayList<>();
         if(copyrightId==null||copyrightId==0){
-            copyrightId=null;
+            baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
+        }else {
+            BaseSettlement baseSettlement = new BaseSettlement();
+            baseSettlement.setCopyrightId(copyrightId);
+            baseSettlementList.add(baseSettlement);
         }
-        List<BaseSettlement> baseSettlements = copyrightDao.selectTableListMonth(copyrightId,page-1,limit);
+        List<BaseSettlement> baseSettlements = copyrightDao.selectTableListMonth(baseSettlementList,page-1,limit);
         DecimalFormat df = new DecimalFormat("#.00");
         for (BaseSettlement baseSettlement : baseSettlements) {
             Double totalAmount = baseSettlement.getTotalAmount();
@@ -101,13 +108,13 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
             baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
             baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
         }
-        Integer count = copyrightDao.selectTableListMonthCount(copyrightId);
+        Integer count = copyrightDao.selectTableListMonthCount(baseSettlementList);
         return PageTableHandler.getJSONObject(baseSettlements,count);
     }
 
     @Override
     public String getAllCopyright() {
-        List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightAll();
+        List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("data",baseSettlements);
         return jsonObject.toJSONString();
@@ -115,22 +122,32 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
 
     @Override
     public String selectBookInfo(Integer copyrightId,Integer page,Integer limit) {
+        List<BaseSettlement> baseSettlementList =new ArrayList<>();
         if(copyrightId==null||copyrightId==0){
-            copyrightId=null;
+            baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
+        }else {
+            BaseSettlement baseSettlement = new BaseSettlement();
+            baseSettlement.setCopyrightId(copyrightId);
+            baseSettlementList.add(baseSettlement);
         }
-        List<BaseSettlement> baseSettlements = copyrightDao.selectBookInfo(copyrightId,page,limit);
-        Integer count = copyrightDao.selectBookInfoCount(copyrightId);
+        List<BaseSettlement> baseSettlements = copyrightDao.selectBookInfo(baseSettlementList,page,limit);
+        Integer count = copyrightDao.selectBookInfoCount(baseSettlementList);
         return PageTableHandler.getJSONObject(baseSettlements,count);
     }
 
     public void updateUserCopyrightMap(){
         List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightAll();
         List<Long> users = copyrightDao.selectUserAll();
+        List<BaseSettlement> baseSettlementList=new ArrayList<>();
         for (Long user : users) {
             for (BaseSettlement baseSettlement : baseSettlements) {
-                baseSettlement.setUserId(user);
+                BaseSettlement settlement = new BaseSettlement();
+                settlement.setUserId(user);
+                settlement.setCopyrightId(baseSettlement.getCopyrightId());
+                settlement.setCopyrightName(baseSettlement.getCopyrightName());
+                baseSettlementList.add(settlement);
             }
         }
-        copyrightDao.updateUserCopyrightMap(baseSettlements);
+        copyrightDao.updateUserCopyrightMap(baseSettlementList);
     }
 }

src/main/resources/mybatis-mappers/CopyrightMapper.xml

@@ -12,7 +12,10 @@
         ON a.report_date=b.report_date AND a.batch_id=b.batch_id AND a.batch_name=b.batch_name
         WHERE a.report_date>='2020-04'
         <if test="copyrightId != null">
-            and a.copyright_id =#{copyrightId}
+            and a.copyright_id in
+            <foreach collection="copyrightId" item="item" index="index" separator="," open="(" close=")">
+                #{item.copyrightId}
+            </foreach>
         </if>
         ORDER BY a.total_amount DESC
         limit #{page},#{limit};
@@ -27,14 +30,17 @@
         ON a.report_date=b.report_date AND a.batch_id=b.batch_id AND a.batch_name=b.batch_name
         WHERE a.report_date>='2020-04'
         <if test="copyrightId != null">
-             and a.copyright_id =#{copyrightId}
+            and a.copyright_id in
+            <foreach collection="copyrightId" item="item" index="index" separator="," open="(" close=")">
+                #{item.copyrightId}
+            </foreach>
         </if>
         ORDER BY a.total_amount DESC ;
     </select>
 
-    <select id="selectCopyrightAll"  resultType="com.boot.security.server.model.BaseSettlement"  >
+    <select id="selectCopyrightById"  resultType="com.boot.security.server.model.BaseSettlement"  >
         SELECT a.copyright_id as copyrightId,a.copyright_name as copyrightName
-        FROM bi_report.book_banquanweihu a group by a.copyright_id,a.copyright_name;
+        FROM bi_report.book_banquanweihu a inner join (select copyright_id from user_copyright_map where user_id=#{userId} and status=1) b on a.copyright_id=b.copyright_id group by a.copyright_id,a.copyright_name;
     </select>
 
     <select id="selectUserAll"  resultType="Long"  >
@@ -42,22 +48,28 @@
         FROM sys_user;
     </select>
 
-    <select id="selectBookInfo"  resultType="com.boot.security.server.model.BaseSettlement"  >
+    <select id="selectBookInfo"  resultType="com.boot.security.server.model.BaseSettlement"  parameterType="com.boot.security.server.model.BaseSettlement">
         SELECT book_id bookId,cp_id cpId,book_name bookName,authors
         FROM bi_report.books_api
         where book_id is not null
         <if test="copyrightId != null">
-        and copyright_id=#{copyrightId}
+            and copyright_id in
+            <foreach collection="copyrightId" item="item" index="index" separator="," open="(" close=")">
+                #{item.copyrightId}
+            </foreach>
         </if>
         limit #{page},#{limit};
     </select>
 
-    <select id="selectBookInfoCount"  resultType="Integer"  >
+    <select id="selectBookInfoCount"  resultType="Integer"  parameterType="com.boot.security.server.model.BaseSettlement">
         SELECT count(*)
         FROM bi_report.books_api
         where book_id is not null
         <if test="copyrightId != null">
-            and copyright_id=#{copyrightId}
+            and copyright_id in
+            <foreach collection="copyrightId" item="item" index="index" separator="," open="(" close=")">
+                #{item.copyrightId}
+            </foreach>
         </if>
     </select>
 

src/main/resources/static/pages/copyrightBookData/bookMonthDetail.html

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>广告主数据汇总</title>
+</head>
+<link rel="stylesheet" href="../../css/treetable/jquery.treetable.css" />
+<link rel="stylesheet" href="../../css/treetable/jquery.treetable.theme.default.css" />
+<link rel="stylesheet" type="text/css" media="screen" href="../../layui/css/layui.css">
+<body>
+<div class="layui-container">
+
+    <div class="layui-form">
+        <div class="layui-row">
+            <div style="width: 160px" class="layui-col-md3">
+                <select id="copyrightId" lay-filter="copyright">
+                    <option value="0">全部</option>
+                </select>
+            </div>
+            <div class="layui-col-md3">
+                <input type="text" class="layui-input" id="date1" style="width: 160px">
+            </div>
+        </div>
+        <div class="layui-row">
+            <div class="layui-col-md1">
+                <input type="text" lay-verify="number" placeholder="bookId" class="layui-input" style="width: 160px">
+            </div>
+            <div class="layui-col-md2">
+                <input type="text"  placeholder="书名" class="layui-input" style="width: 160px">
+            </div>
+            <div class="layui-col-md2">
+                <button type="button" class="layui-btn layui-btn-normal">查询</button>
+            </div>
+        </div>
+        <div class="layui-row">
+             <table class="layui-table" id="bookMonthDetail_table" lay-filter="test">
+             </table>
+        </div>
+    </div>
+</div>
+</body>
+</html>
+
+<script type="text/javascript" src="../../js/libs/jquery-2.1.1.min.js"></script>
+<script type="text/javascript" src="../../js/jq.js"></script>
+<script type="text/javascript" src="../../layui/layui.js"></script>
+<script type="text/javascript" src="../../js/my/permission.js"></script>
+<script src="../../js/libs/jquery.treetable.js"></script>
+<script type="text/javascript" src="../../js/echarts.min.js"></script>
+<script>
+
+    var copyrightId;
+    copyrightId=$("#copyrightId");
+    var form;
+    var copyrights;
+    var tableIns;
+    var startTime;
+    var endTime;
+    var day = new Date();
+    startTime = day.format("yyyy-MM");
+    endTime=day.format("yyyy-MM");
+
+    layui.use('laydate', function(){
+        var laydate = layui.laydate;
+        laydate.render({
+            elem: '#date1'
+            ,range: true
+            ,type:'month'
+            ,value:startTime+' - '+endTime
+            ,done: function(value, date, endDate) {
+                var smonth=date.month;
+                var emonth=endDate.month;
+                var snumberm = parseInt(smonth);
+                var enumberm = parseInt(emonth);
+                if(snumberm<10){
+                    smonth='0'+smonth
+                }
+                if(enumberm<10){
+                    emonth='0'+emonth
+                }
+                startTime=date.year+'-'+smonth;
+                endTime=endDate.year+'-'+emonth;
+                tableIns.reload({where:{startTime:startTime,endTime:endTime}})
+            }
+        });
+    });
+
+    layui.use('table', function() {
+        var table = layui.table;
+        tableIns=table.render({
+            elem: '#bookMonthDetail_table'
+            ,method:'post'
+            ,contentType:'application/json'
+            ,where:{startTime:startTime,endTime:endTime}
+            ,url: '/copyrightBookController/settlementMonth'
+            ,page: true
+            ,toolbar:'true'
+            ,defaultToolbar: ['exports']
+            ,cols: [[
+                {field: 'reportDate', title: '日期', sort: true,fixed:'left'}
+                ,{field: 'bookId', title: 'cpId', hide: true}
+                ,{field: 'bookName', title: '书名'}
+                ,{field: 'authors', title: '作者'}
+                ,{field: 'totalAmount', title: '销售金额'}
+                ,{field: 'settlementAmount', title: '销售结算'}
+                ,{field: 'totalAdvertAmount', title: '广告金额'}
+                ,{field: 'settlementAdAmount', title: '广告结算'}
+                ,{field: 'countSettlement', title: '总结算'}
+            ]] //设置表头
+        });
+
+    });
+
+
+    layui.use('form', function() {
+        form = layui.form;
+        form.on('select(copyright)', function(data){
+            copyrights=data.value;
+            reload(copyrights)
+
+        });
+    });
+
+    function reload(data) {
+        //执行重载
+        tableIns.reload({
+            page: {
+                curr: 1 //重新从第 1 页开始
+            }
+            ,where: {
+                copyrightIds: data
+            }
+        });
+    }
+
+
+    function init(){
+        //var list={copyrightId:copyrightId};
+        $.ajax({
+            //请求方式
+            type : "post",
+            //请求的媒体类型
+            contentType: "application/json;charset=UTF-8",
+            //请求地址
+            url : "/copyrightBookController/getAllCopyright",
+            async:false,
+            //数据，json字符串
+            //data : JSON.stringify(list),ajax controller有请求参数必须传参写data
+            //请求成功
+            success : function(result) {
+                var jsonObj = JSON.parse(result);
+                setOption(jsonObj.data);
+            }
+        });
+    }
+
+    function setOption(data){
+        var len=data.length;
+        for(j = 0; j < len; j++) {
+            copyrightId.append("<option value="+data[j].copyrightId+">"+data[j].copyrightName+"</option>");
+        }
+    }
+
+
+init();
+
+</script>
+

src/main/resources/static/pages/copyrightBookData/copyrightMonthSettlement.html

@@ -17,8 +17,8 @@
                     <option value="0">全部</option>
                 </select>
             </div>
-            <div class="layui-col-md3">
-                <span>未结算金额:</span>
+            <div class="layui-col-md4">
+                <span style="float: right;color: #ed1c24;">未结算金额:</span>
             </div>
         </div>
         <div class="layui-row">