上传bug修复

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

@@ -15,9 +15,9 @@ public interface CopyrightDao {
 
     List<Long> selectUserAll();
 
-    List<BaseSettlement>  selectTableListMonth(@Param("copyrightId") List<BaseSettlement> 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,@Param("status") Integer status);
 
-    Integer selectTableListMonthCount(@Param("copyrightId") List<BaseSettlement> copyrightId);
+    Integer selectTableListMonthCount(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("status") Integer status);
 
     List<BaseSettlement> selectBookInfo(@Param("copyrightId") List<BaseSettlement> copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
 

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

@@ -17,10 +17,11 @@ import java.util.List;
 public class CopyrightBookServiceImpl implements CopyrightBookService {
     @Autowired
     CopyrightDao copyrightDao;
+
     @Override
     public String selectSettlement(Integer copyrightId,Integer page,Integer limit) {
-        Integer userId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
-
+        Integer roleId = copyrightDao.selectRoleId(UserUtil.getLoginUser().getId());
+        Integer status=null;
         List<BaseSettlement> baseSettlementList =new ArrayList<>();
         if(copyrightId==null||copyrightId==0){
             baseSettlementList = copyrightDao.selectCopyrightById(UserUtil.getLoginUser().getId());
@@ -29,7 +30,11 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
             baseSettlement.setCopyrightId(copyrightId);
             baseSettlementList.add(baseSettlement);
         }
-        List<BaseSettlement> baseSettlements = copyrightDao.selectTableListMonth(baseSettlementList,page-1,limit);
+        if(roleId!=3){
+            status=1;
+        }
+        List<BaseSettlement> baseSettlements = copyrightDao.selectTableListMonth(baseSettlementList,page-1,limit,status);
+
         DecimalFormat df = new DecimalFormat("#.00");
         for (BaseSettlement baseSettlement : baseSettlements) {
             Double totalAmount = baseSettlement.getTotalAmount();
@@ -133,6 +138,7 @@ public class CopyrightBookServiceImpl implements CopyrightBookService {
             baseSettlement.setCopyrightId(copyrightId);
             baseSettlementList.add(baseSettlement);
         }
+
         List<BaseSettlement> baseSettlements = copyrightDao.selectBookDetail(baseSettlementList,bookId,bookName,startTime,endTime,page-1,limit);
         DecimalFormat df = new DecimalFormat("#.00");
         for (BaseSettlement baseSettlement : baseSettlements) {

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

@@ -17,6 +17,9 @@
                 #{item.copyrightId}
             </foreach>
         </if>
+        <if test="status != null and status!='' ">
+            and  a.release_status = #{status}
+        </if>
         ORDER BY a.total_amount DESC
         limit #{page},#{limit};
     </select>
@@ -35,6 +38,9 @@
                 #{item.copyrightId}
             </foreach>
         </if>
+        <if test="status != null and status!='' ">
+            and  a.release_status = #{status}
+        </if>
         ORDER BY a.total_amount DESC ;
     </select>
 
@@ -91,7 +97,7 @@
         from bi_report.report_books_settlement_month a
         WHERE
         <![CDATA[
-	    a.report_date>= #{startTime}  and a.report_date <= #{endTime}
+	    a.report_date>= '2020-04'  and a.report_date <= #{endTime}
 	    ]]>
         <if test="bookId != null and bookId!='' ">
             and  b.book_id = #{bookId}
@@ -113,7 +119,7 @@
         from bi_report.report_books_settlement_month a
         WHERE
         <![CDATA[
-	    a.report_date>= #{startTime}  and a.report_date <= #{endTime}
+	    a.report_date>= '2020-04'  and a.report_date <= #{endTime}
 	    ]]>
         <if test="bookId != null and bookId!='' ">
             and  b.book_id = #{bookId}