类属性修改

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

@@ -71,10 +71,10 @@ public class CopyrightBookController {
         List<BaseSettlement> array = request.getArray();
         if(array.size()>0){
             for (BaseSettlement baseSettlement : array) {
-                copyrightDao.updateDeductionConfig(baseSettlement.getCopyrightId(),request.getTypeName(),type,request.getContext());
+                copyrightDao.updateDeductionConfig(baseSettlement.getCopyrightId(),request.getTypeName(),type,request.getContext(),baseSettlement.getReportDate());
             }
         }
-        copyrightDao.updateDeductionConfig(request.getCopyrightId(),request.getTypeName(),type,request.getContext());
+        //copyrightDao.updateDeductionConfig(request.getCopyrightId(),request.getTypeName(),type,request.getContext(),request.getStartTime());
     }
 
     @PostMapping("/updateSettlementStatus")

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

@@ -45,9 +45,9 @@ public interface CopyrightDao {
 
     int updateUserCopyrightMap(List<BaseSettlement> baseSettlements);
 
-    @Select("select copyright_id copyrightId,copyright_name copyrightName,type,type_name typeName,context from copyright_data.copyright_deduction limit #{page},#{limit};")
+    @Select("select create_month reportDate,copyright_id copyrightId,copyright_name copyrightName,type,type_name typeName,context from copyright_data.copyright_deduction limit #{page},#{limit};")
     List<BaseSettlement> getDeductionConfig(@Param("page") Integer page,@Param("limit")Integer limit);
 
-    @Update("update copyright_data.copyright_deduction set type=#{type},type_name=#{typeName},context=#{context} where copyright_id=#{copyrightId}")
-    int updateDeductionConfig(@Param("copyrightId") Integer copyrightId,@Param("typeName") String typeName,@Param("type") Integer type,@Param("context") String context);
+    @Update("update copyright_data.copyright_deduction set type=#{type},type_name=#{typeName},context=#{context} where copyright_id=#{copyrightId} and create_month=#{reportDate}")
+    int updateDeductionConfig(@Param("copyrightId") Integer copyrightId,@Param("typeName") String typeName,@Param("type") Integer type,@Param("context") String context,@Param("reportDate") String reportDate);
 }

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

@@ -104,7 +104,7 @@
         SELECT report_date,a.copyright_id,a.copyright_name,total_amount as totalAmount,
         IFNULL(total_ad_amount,0) totalAdvertAmount,jiesuan_status_name statusName,jiesuan_status status,release_status_name releaseStatusName,release_status releaseStatus,b.type,b.type_name,b.context
         FROM bi_report.report_book_settlement_month_copyright a,copyright_data.copyright_deduction b
-        WHERE a.report_date>='2020-04' and a.copyright_id=b.copyright_id
+        WHERE a.report_date>='2020-04' and a.copyright_id=b.copyright_id and a.report_date=b.create_month
         <if test="copyrightId != null">
             and a.copyright_id in
             <foreach collection="copyrightId" item="item" index="index" separator="," open="(" close=")">
@@ -171,7 +171,7 @@
         WHERE
         <![CDATA[
 	    a.report_date>= #{startTime}  and a.report_date <= #{endTime}
-	    ]]>  and a.copyright_id=b.copyright_id
+	    ]]>  and a.copyright_id=b.copyright_id and a.report_date=b.create_month
         <if test="bookId != null and bookId!='' ">
             and  a.book_id = #{bookId}
         </if>

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

@@ -80,6 +80,7 @@
                 ,height:500
                 ,cols: [[
                     {type:"checkbox"}
+                    ,{field: 'reportDate', title: '月份', hide: false}
                     ,{field: 'copyrightId', title: '版权费id', hide: true}
                     ,{field: 'copyrightName', title: '版权方名称'}
                     ,{field: 'typeName', title: '扣量方式',edit:"text"}