上传bug修复

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

@@ -370,13 +370,13 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
                     Double totalAdvertAmountC = baseSettlement.getTotalAdvertAmount();
                     Double totalAmount = settlement.getTotalAmount();
                     Double totalAdvertAmount =settlement.getTotalAdvertAmount();
-                    if(totalAmountC!=0.0){
+                    if(totalAmountC!=0.0&&totalAmount!=null&&totalAmountC!=null){
                         settlement.setBookRadio(Double.valueOf( df.format( totalAmount/totalAmountC )  ));
                     }else {
                         settlement.setBookRadio(0.0);
                     }
 
-                    if(totalAdvertAmountC!=0.0){
+                    if(totalAdvertAmountC!=0.0&&totalAdvertAmount!=null&&totalAdvertAmountC!=null){
                         settlement.setBookAdRadio(Double.valueOf( df.format( totalAdvertAmount/totalAdvertAmountC )  ));
                     }else {
                         settlement.setBookAdRadio(0.0);

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

@@ -192,7 +192,7 @@
         from bi_report.report_books_settlement_month a
         WHERE
         <![CDATA[
-	    a.report_date>= '2020-04'  and a.report_date <= #{endTime}
+	    a.report_date>= #{startTime}  and a.report_date <= #{endTime}
 	    ]]>
         <if test="bookId != null and bookId!='' ">
             and  a.book_id = #{bookId}