上传bug修复

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

 package com.boot.security.server.controller;
 
+import com.boot.security.server.dao.CopyrightDao;
+import com.boot.security.server.model.BaseSettlement;
 import com.boot.security.server.page.table.PageTableRequest;
 import com.boot.security.server.service.CopyrightBookService;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.*;
 public class CopyrightBookController {
     @Autowired
     CopyrightBookService copyrightBookService;
+    @Autowired
+    CopyrightDao copyrightDao;
 
     @PostMapping("/settlementMonth")
     @ApiOperation(value = "获取月结算数据")
@@ -25,4 +29,12 @@ public class CopyrightBookController {
     public String getAllCopyright(){
         return copyrightBookService.getAllCopyright();
     }
+
+    @PostMapping("/updateSettlementStatus")
+    @ApiOperation(value = "版权方数据")
+    public void updateSettlementStatus(@RequestBody PageTableRequest request){
+        System.out.println(request.getBaseSettlement().getStatusName());
+        BaseSettlement baseSettlement = request.getBaseSettlement();
+        copyrightDao.updateSettlementStatus(baseSettlement.getCopyrightId(),baseSettlement.getReportDate(),baseSettlement.getStatus(),baseSettlement.getStatusName());
+    }
 }

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

@@ -17,6 +17,6 @@ public interface CopyrightDao {
 
     List<BaseSettlement> selectBookDetail(@Param("copyrightIdList") List<BaseSettlement> copyrightIdList,@Param("bookId") Long bookId,@Param("bookName") String bookName);
 
-    @Update("update report_book_settlement_month set jiesuan_status=#{status},jiesuan_status_name=#{statusName} where report_date=#{reportDate} and copyright_id=#{copyrightId}")
+    @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/model/BaseSettlement.java

@@ -17,15 +17,38 @@ public class BaseSettlement extends BaseEntity<Long>{
 	public String book_name;
 	public String authors;
 	public Double totalAmount;
-	public String jiesuan_amount;
+	public String settlementAmount;
 	public String kouliang_amount;
 	public String all_consume;
 	public Double totalAdvertAmount;
 	public String jiesuan_ad_amount;
 	public String kouliang_ad_amount;
-	public Integer jiesuanStatus;
-	public String jiesuanStatusName;
+	public Integer status;
+	public String statusName;
 
+	public String getSettlementAmount() {
+		return settlementAmount;
+	}
+
+	public void setSettlementAmount(String settlementAmount) {
+		this.settlementAmount = settlementAmount;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public String getStatusName() {
+		return statusName;
+	}
+
+	public void setStatusName(String statusName) {
+		this.statusName = statusName;
+	}
 
 	public String getReportDate() {
 		return reportDate;
@@ -108,14 +131,6 @@ public class BaseSettlement extends BaseEntity<Long>{
 	}
 
 
-	public String getJiesuan_amount() {
-		return jiesuan_amount;
-	}
-
-	public void setJiesuan_amount(String jiesuan_amount) {
-		this.jiesuan_amount = jiesuan_amount;
-	}
-
 	public String getKouliang_amount() {
 		return kouliang_amount;
 	}
@@ -181,19 +196,4 @@ public class BaseSettlement extends BaseEntity<Long>{
 		this.totalAdvertAmount = totalAdvertAmount;
 	}
 
-	public Integer getJiesuanStatus() {
-		return jiesuanStatus;
-	}
-
-	public void setJiesuanStatus(Integer jiesuanStatus) {
-		this.jiesuanStatus = jiesuanStatus;
-	}
-
-	public String getJiesuanStatusName() {
-		return jiesuanStatusName;
-	}
-
-	public void setJiesuanStatusName(String jiesuanStatusName) {
-		this.jiesuanStatusName = jiesuanStatusName;
-	}
 }

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

@@ -6,7 +6,7 @@
     <select id="selectTableListMonth"  resultType="com.boot.security.server.model.BaseSettlement"  parameterType="com.boot.security.server.model.BaseSettlement">
         SELECT
         a.report_date AS reportDate,a.copyright_id as copyrightId,a.copyright_name as copyrightName,
-        a.total_amount as totalAmount,IFNULL(b.total_ad_amount,0) totalAdvertAmount,jiesuan_status_name jiesuanStatusName,jiesuan_status jiesuanStatus
+        a.total_amount as totalAmount,IFNULL(b.total_ad_amount,0) totalAdvertAmount,jiesuan_status_name statusName,jiesuan_status status
         FROM bi_report.report_book_settlement_month a
         LEFT JOIN  bi_report.report_book_advert_month b
         ON a.report_date=b.report_date AND a.batch_id=b.batch_id AND a.batch_name=b.batch_name

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

@@ -14,6 +14,7 @@
         <div class="layui-row">
             <div style="width: 160px" class="layui-col-md3">
                 <select id="copyrightId" lay-filter="copyright">
+                    <option>全部</option>
                 </select>
             </div>
             <div class="layui-col-md3">
@@ -60,15 +61,44 @@
                 ,{field: 'copyrightName', title: '版权方名称'}
                 ,{field: 'totalAmount', title: '销售金额'}
                 ,{field: 'totalAdvertAmount', title: '广告金额'}
-                ,{field: 'jiesuanStatusName', title: '结算状态'}
+                ,{field: 'statusName', title: '结算状态'}
                 ,{title: '操作', toolbar: '#operation',fixed: 'right'}
             ]] //设置表头
         });
 
         table.on('tool(test)', function(obj){
             var data = obj.data; //获得当前行数据
-            console.log(data);
-            layer.msg("hehe");
+            layer.open({
+                title: '操作'
+                ,content: '合作方:'+data.copyrightName+"<br>"+'日期:'+data.reportDate+'<br>结算金额:'+data.totalAmount+'<br>'+'<select id="statusId"><option value="0">未结算</option><option value="1">已结算</option></select>'
+                ,yes: function(index, layero){
+                    var status=$("#statusId").val();
+                    var statusName;
+                    if(status==0){
+                        statusName='未结算';
+                    }else {
+                        statusName='已结算';
+                    }
+                    var list={baseSettlement:{status:status,reportDate:data.reportDate,copyrightId:data.copyrightId,statusName:statusName}};
+                    $.ajax({
+                        //请求方式
+                        type : "post",
+                        //请求的媒体类型
+                        contentType: "application/json;charset=UTF-8",
+                        //请求地址
+                        url : "/copyrightBookController/updateSettlementStatus",
+                        async:false,
+                        //数据，json字符串
+                        data : JSON.stringify(list),//ajax controller有请求参数必须传参写data
+                        //请求成功
+                        success : function(result) {
+                            tableIns.reload();
+                            //var jsonObj = JSON.parse(result);
+                        }
+                    });
+                    layer.close(index); //如果设定了yes回调，需进行手工关闭
+                }
+            });
         });
     });