上传bug修复

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

@@ -13,6 +13,9 @@ public interface CopyrightDao {
     @Select("select roleId from sys_role_user where userId=#{userId}")
     Integer selectRoleId(@Param("userId") Long userId);
 
+    @Select("SELECT a.report_date AS reportDate,a.copyright_id as copyrightId from bi_report.report_book_settlement_month a where a.release_status =1")
+    List<BaseSettlement> selectReleaseCopyright();
+
     List<Long> selectUserAll();
 
     List<BaseSettlement>  selectTableListMonth(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("page") Integer page,@Param("limit")Integer limit,@Param("status") Integer status);

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

@@ -124,12 +124,13 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
             }
             baseSettlement.setCountSettlement(Double.valueOf(df.format(baseSettlement.getSettlementAmount()+baseSettlement.getSettlementAdAmount())));
         }
-        Integer count = copyrightDao.selectTableListMonthCount(baseSettlementList);
+        Integer count = copyrightDao.selectTableListMonthCount(baseSettlementList,status);
         return PageTableHandler.getJSONObject(baseSettlements,count);
     }
 
     @Override
     public String selectBookSettlement(Integer copyrightId,String startTime,String endTime,Long bookId,String bookName,Integer page,Integer limit) {
+        Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
         List<BaseSettlement> baseSettlementList =new ArrayList<>();
         if(copyrightId==null||copyrightId==0){
             baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
@@ -139,9 +140,25 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
             baseSettlementList.add(baseSettlement);
         }
 
+        List<BaseSettlement> list =new ArrayList<>();
+
+        if(roleId!=3){
+            list = copyrightDao.selectReleaseCopyright();
+        }
         List<BaseSettlement> baseSettlements = copyrightDao.selectBookDetail(baseSettlementList,bookId,bookName,startTime,endTime,page-1,limit);
         DecimalFormat df = new DecimalFormat("#.00");
         for (BaseSettlement baseSettlement : baseSettlements) {
+            Boolean flag=false;
+            for (BaseSettlement settlement : list) {
+                if( (settlement.getReportDate().equals(baseSettlement.getReportDate())) && (settlement.getCopyrightId()==baseSettlement.getCopyrightId())){
+                    flag=true;
+                    break;
+                }
+            }
+            if (flag==false&&list.size()>0){
+                baseSettlements.remove(baseSettlement);
+                break;
+            }
             if(baseSettlement.getTotalAmount()==null){
                     baseSettlement.setTotalAmount(0d);
             }

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

@@ -173,6 +173,8 @@
         console.log(startTime);
         console.log(endTime);
         console.log(copyrights);
+        var list={bookId:bookId,bookName:bookName,startTime:startTime,endTime:endTime,copyrightIds:copyrights};
+        tableIns.reload({where:{bookId:bookId,bookName:bookName,startTime:startTime,endTime:endTime,copyrightIds:copyrights}})
     }