上传bug修复

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

@@ -31,6 +31,33 @@ public class BaseSettlement extends BaseEntity<Long>{
 	public String statusName;
 	public String releaseStatusName;
 	public Integer releaseStatus;
+	public Integer type;
+	public String typeName;
+	public String context;
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public String getTypeName() {
+		return typeName;
+	}
+
+	public void setTypeName(String typeName) {
+		this.typeName = typeName;
+	}
+
+	public String getContext() {
+		return context;
+	}
+
+	public void setContext(String context) {
+		this.context = context;
+	}
 
 	public String getReleaseStatusName() {
 		return releaseStatusName;

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

@@ -25,10 +25,10 @@
     <!--</select>-->
 
     <select id="selectTableListMonth"  resultType="com.boot.security.server.model.BaseSettlement"  parameterType="com.boot.security.server.model.BaseSettlement">
-        SELECT report_date,copyright_id,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
-        FROM bi_report.report_book_settlement_month_copyright a
-        WHERE a.report_date>='2020-04'
+        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
         <if test="copyrightId != null">
             and a.copyright_id in
             <foreach collection="copyrightId" item="item" index="index" separator="," open="(" close=")">
@@ -166,12 +166,12 @@
     </insert>
 
     <select id="selectBookDetail"  resultType="com.boot.security.server.model.BaseSettlement"  parameterType="java.util.List">
-        select report_date reportDate,copyright_id copyrightId,copyright_name copyrightName,book_id bookId,book_name bookName,authors,total_amount totalAmount,total_ad_amount totalAdvertAmount
-        from bi_report.report_books_settlement_month a
+        select report_date reportDate,a.copyright_id copyrightId,a.copyright_name copyrightName,book_id bookId,book_name bookName,authors,total_amount totalAmount,total_ad_amount totalAdvertAmount,b.type,b.type_name,b.context
+        from bi_report.report_books_settlement_month a,copyright_data.copyright_deduction b
         WHERE
         <![CDATA[
 	    a.report_date>= '2020-04'  and a.report_date <= #{endTime}
-	    ]]>
+	    ]]>  and a.copyright_id=b.copyright_id
         <if test="bookId != null and bookId!='' ">
             and  a.book_id = #{bookId}
         </if>