上传bug修复

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

 package com.boot.security.server.controller;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.boot.security.server.page.table.PageTableRequest;
+import com.boot.security.server.service.CopyrightBookService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/copyrightBookController")
 public class CopyrightBookController {
+    @Autowired
+    CopyrightBookService copyrightBookService;
 
+    @PostMapping("/settlementMonth")
+    @ApiOperation(value = "获取月结算数据")
+    @ResponseBody
+    public String getSettlementMonthData(@RequestBody PageTableRequest request) {
+        return copyrightBookService.selectSettlement(request.getBaseSettlement(),request.getPage(),request.getLimit());
+    }
+
+    @PostMapping("/getAllCopyright")
+    @ApiOperation(value = "获取月结算数据")
+    @ResponseBody
+    public String getAllCopyright(@RequestBody PageTableRequest request){
+        return copyrightBookService.getAllCopyright();
+    }
 }

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

@@ -9,7 +9,9 @@ import java.util.List;
 
 @Mapper
 public interface CopyrightDao {
-    List<BaseSettlement>  selectTableListMonth(@Param("copyrightIdList") List<BaseSettlement> copyrightIdList);
+    List<BaseSettlement>  selectTableListMonth(@Param("copyrightId") BaseSettlement copyrightId,@Param("page") Integer page,@Param("limit")Integer limit);
+
+    Integer selectTableListMonthCount(@Param("copyrightId") BaseSettlement copyrightId);
 
     List<BaseSettlement> selectCopyrightAll();
 

src/main/java/com/boot/security/server/model/BaseSettlement.java

@@ -2,68 +2,37 @@ package com.boot.security.server.model;
 
 
 
-public class BaseSettlement {
-
-	private String report_date;
-	private String copyright_id; //
-	private String copyright_name; //
-	private String copyright_start_date; //
-	private String copyright_end_date; //
-	private String fencheng_ratio; //
-	private String kouliang_ratio; //
-	private String batch_id; //
-	private String batch_name; //
-	private String book_id; //
-	private String book_name; //
-	private String authors; //
-	private String total_amount; //
-	private String jiesuan_amount; //
-	private String kouliang_amount; //
-	private String all_consume; //
-	private String total_ad_amount; //
-	private String jiesuan_ad_amount; //
-	private String kouliang_ad_amount; //
-	private Integer status;
-	private String status_name;
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public String getStatus_name() {
-		return status_name;
-	}
-
-	public void setStatus_name(String status_name) {
-		this.status_name = status_name;
-	}
-
-	public String getReport_date() {
-		return report_date;
-	}
-
-	public void setReport_date(String report_date) {
-		this.report_date = report_date;
-	}
-
-	public String getCopyright_id() {
-		return copyright_id;
-	}
-
-	public void setCopyright_id(String copyright_id) {
-		this.copyright_id = copyright_id;
-	}
-
-	public String getCopyright_name() {
-		return copyright_name;
-	}
-
-	public void setCopyright_name(String copyright_name) {
-		this.copyright_name = copyright_name;
+public class BaseSettlement extends BaseEntity<Long>{
+
+	public String reportDate;
+	public Integer copyrightId;
+	public String copyrightName;
+	public String copyright_start_date;
+	public String copyright_end_date;
+	public String fencheng_ratio;
+	public String kouliang_ratio;
+	public String batch_id;
+	public String batch_name;
+	public String book_id;
+	public String book_name;
+	public String authors;
+	public Double totalAmount;
+	public String jiesuan_amount;
+	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 String getReportDate() {
+		return reportDate;
+	}
+
+	public void setReportDate(String reportDate) {
+		this.reportDate = reportDate;
 	}
 
 	public String getCopyright_start_date() {
@@ -138,13 +107,6 @@ public class BaseSettlement {
 		this.authors = authors;
 	}
 
-	public String getTotal_amount() {
-		return total_amount;
-	}
-
-	public void setTotal_amount(String total_amount) {
-		this.total_amount = total_amount;
-	}
 
 	public String getJiesuan_amount() {
 		return jiesuan_amount;
@@ -170,13 +132,6 @@ public class BaseSettlement {
 		this.all_consume = all_consume;
 	}
 
-	public String getTotal_ad_amount() {
-		return total_ad_amount;
-	}
-
-	public void setTotal_ad_amount(String total_ad_amount) {
-		this.total_ad_amount = total_ad_amount;
-	}
 
 	public String getJiesuan_ad_amount() {
 		return jiesuan_ad_amount;
@@ -193,4 +148,52 @@ public class BaseSettlement {
 	public void setKouliang_ad_amount(String kouliang_ad_amount) {
 		this.kouliang_ad_amount = kouliang_ad_amount;
 	}
+
+	public Integer getCopyrightId() {
+		return copyrightId;
+	}
+
+	public void setCopyrightId(Integer copyrightId) {
+		this.copyrightId = copyrightId;
+	}
+
+	public String getCopyrightName() {
+		return copyrightName;
+	}
+
+	public void setCopyrightName(String copyrightName) {
+		this.copyrightName = copyrightName;
+	}
+
+	public Double getTotalAmount() {
+		return totalAmount;
+	}
+
+	public void setTotalAmount(Double totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	public Double getTotalAdvertAmount() {
+		return totalAdvertAmount;
+	}
+
+	public void setTotalAdvertAmount(Double totalAdvertAmount) {
+		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/java/com/boot/security/server/page/table/PageTableRequest.java

 package com.boot.security.server.page.table;
 
 import com.boot.security.server.model.AdvertiserData;
+import com.boot.security.server.model.BaseSettlement;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -22,8 +23,26 @@ public class PageTableRequest implements Serializable {
 	private String startTime;
 	private String endTime;
 	private Integer advertiserId;
+	private Integer CopyrightId;
 	private String advertId;
 	private AdvertiserData advertiserData;
+	private BaseSettlement baseSettlement;
+
+	public Integer getCopyrightId() {
+		return CopyrightId;
+	}
+
+	public void setCopyrightId(Integer copyrightId) {
+		CopyrightId = copyrightId;
+	}
+
+	public BaseSettlement getBaseSettlement() {
+		return baseSettlement;
+	}
+
+	public void setBaseSettlement(BaseSettlement baseSettlement) {
+		this.baseSettlement = baseSettlement;
+	}
 
 	public AdvertiserData getAdvertiserData() {
 		return advertiserData;

src/main/java/com/boot/security/server/service/CopyrightBookService.java

 package com.boot.security.server.service;
 
+import com.boot.security.server.model.BaseSettlement;
+
 public interface CopyrightBookService {
+    String selectSettlement(BaseSettlement copyrightId,Integer page,Integer limit);
+    String getAllCopyright();
 }

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

 package com.boot.security.server.service.impl;
 
-public class CopyrightBookServiceImpl {
+import com.alibaba.fastjson.JSONObject;
+import com.boot.security.server.dao.CopyrightDao;
+import com.boot.security.server.model.BaseSettlement;
+import com.boot.security.server.page.table.PageTableHandler;
+import com.boot.security.server.service.CopyrightBookService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CopyrightBookServiceImpl implements CopyrightBookService {
+    @Autowired
+    CopyrightDao copyrightDao;
+    @Override
+    public String selectSettlement(BaseSettlement copyrightId,Integer page,Integer limit) {
+        List<BaseSettlement> baseSettlements = copyrightDao.selectTableListMonth(copyrightId,page-1,limit);
+        Integer count = copyrightDao.selectTableListMonthCount(copyrightId);
+        return PageTableHandler.getJSONObject(baseSettlements,count);
+    }
+
+    @Override
+    public String getAllCopyright() {
+        List<BaseSettlement> baseSettlements = copyrightDao.selectCopyrightAll();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("data",baseSettlements);
+        return jsonObject.toJSONString();
+    }
 }

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

@@ -3,27 +3,38 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.boot.security.server.dao.CopyrightDao">
 
-    <select id="selectTableListMonth"  resultType="com.boot.security.server.model.BaseSettlement"  parameterType="java.util.List">
+    <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
+        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
+        <if test="copyrightId != null">
+            WHERE
+            a.copyright_id =#{copyrightId.copyright_id}
+        </if>
+        ORDER BY a.total_amount DESC
+        limit #{page},#{limit};
+    </select>
+
+    <select id="selectTableListMonthCount"  resultType="Integer"  parameterType="com.boot.security.server.model.BaseSettlement">
 
         SELECT
-        a.report_date AS report_date,a.copyright_id,a.copyright_name,
-        a.total_amount,IFNULL(b.total_ad_amount,0) total_ad_amount,jiesuan_status_name,jiesuan_status
-        FROM report_book_settlement_month a
-        LEFT JOIN  report_book_advert_month b
+        count(*)
+        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
-        <if test="copyrightIdList != null and copyrightIdList.size>0">
-        WHERE
-             a.copyright_id in
-            <foreach collection="copyrightIdList" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
+        <if test="copyrightId != null">
+            WHERE
+            a.copyright_id =#{copyrightId.copyright_id}
         </if>
         ORDER BY a.total_amount DESC ;
     </select>
 
     <select id="selectCopyrightAll"  resultType="com.boot.security.server.model.BaseSettlement"  >
-        SELECT a.copyright_id,a.copyright_name
-        FROM book_banquanweihu group by copyright_id,copyright_name;
+        SELECT a.copyright_id as copyrightId,a.copyright_name as copyrightName
+        FROM bi_report.book_banquanweihu group by copyright_id,copyright_name;
     </select>
 
     <select id="selectBookDetail"  resultType="com.boot.security.server.model.BaseSettlement"  parameterType="java.util.List">