上传bug修复

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

@@ -25,7 +25,7 @@ public interface CopyrightDao {
     @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);
+    List<BaseSettlement> selectBookDetail(@Param("copyrightIdList") List<BaseSettlement> copyrightIdList,@Param("bookId") Long bookId,@Param("bookName") String bookName,@Param("startTime") String startTime,@Param("endTime") String endTime);
 
     @Update("update bi_report.report_book_settlement_month set jiesuan_status=#{status},jiesuan_status_name=#{statusName} where report_date=#{reportDate} and copyright_id=#{copyrightId}")
     int updateSettlementStatus(@Param("copyrightId") Integer copyrightId,@Param("reportDate") String reportDate,@Param("status") Integer status,@Param("statusName") String statusName);

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

@@ -104,8 +104,17 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
                 count=2000.0+3000*0.5+5000*0.2+20000*0.2*2+50000*0.15+200000*0.1*2+500000*0.02+2000000*0.02+a1*0.02;
             }
             count=Double.valueOf(df.format(count));
-            baseSettlement.setTotalAdvertAmount(count);
-            baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
+            Integer id = baseSettlement.getCopyrightId();
+            if(id==3219||id==3230||id==3254||id==3253){
+                count=Double.valueOf(df.format(baseSettlement.getTotalAmount()+count));
+                baseSettlement.setTotalAmount(count);
+                baseSettlement.setSettlementAmount(Double.valueOf(df.format(count*0.5)));
+                baseSettlement.setTotalAdvertAmount(0d);
+                baseSettlement.setSettlementAdAmount(0d);
+            }else {
+                baseSettlement.setTotalAdvertAmount(count);
+                baseSettlement.setSettlementAdAmount(Double.valueOf(df.format(count*0.5)));
+            }
             baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
         }
         Integer count = copyrightDao.selectTableListMonthCount(baseSettlementList);

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

@@ -23,13 +23,13 @@
         </div>
         <div class="layui-row">
             <div class="layui-col-md1">
-                <input type="text" lay-verify="number" placeholder="bookId" class="layui-input" style="width: 160px">
+                <input type="text" lay-verify="number" placeholder="bookId" class="layui-input" style="width: 160px" id="bookId">
             </div>
             <div class="layui-col-md2">
-                <input type="text"  placeholder="书名" class="layui-input" style="width: 160px">
+                <input type="text"  placeholder="书名" class="layui-input" style="width: 160px" id="bookName">
             </div>
             <div class="layui-col-md2">
-                <button type="button" class="layui-btn layui-btn-normal">查询</button>
+                <button type="button" class="layui-btn layui-btn-normal" onclick="buttonClick();">查询</button>
             </div>
         </div>
         <div class="layui-row">
@@ -161,6 +161,21 @@
         }
     }
 
+    function buttonClick(){
+        var bookId=$("#bookId").val();
+        var bookName=$("#bookName").val();
+        var date1=$("#date1").val();
+        copyrights=copyrightId.val();
+        startTime=date1.split(" - ")[0];
+        endTime=date1.split(" - ")[1];
+        console.log(bookId);
+        console.log(bookName);
+        console.log(startTime);
+        console.log(endTime);
+        console.log(copyrights);
+    }
+
+
 
 init();