1.业务利润箱属检索条件bug修改

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FinanceProfitDtoList.java

@@ -5,7 +5,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -113,7 +112,7 @@ public class FinanceProfitDtoList {
 	/**
 	 * 箱属
 	 */
-	@ExcelProperty(value = "箱属")
+	@ExcelIgnore
 	private String boxBelongsTo;
 
 	/**

blade-service-api/blade-los-api/src/main/java/org/springblade/los/view/entity/FinanceProfit.java

@@ -103,6 +103,8 @@ public class FinanceProfit implements Serializable {
 	 */
 	@TableField(exist = false)
 	private BigDecimal realAmountProfitLoc;
+	private String boxBelongsTo;
+
 
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/view/mapper/FinanceProfitMapper.xml

@@ -84,7 +84,8 @@
         seb.corp_source AS corpSource,
         seb.ocean_freight_dr AS oceanFreightDr,
         seb.ocean_freight_cr AS oceanFreightCr,
-        seb.ocean_freight_profit AS oceanFreightProfit
+        seb.ocean_freight_profit AS oceanFreightProfi,
+        seb.box_belongs_to as boxBelongsTo
         FROM
         los_finance_profit seb
         WHERE
@@ -129,9 +130,10 @@
         </if>
         <if test='data.srcId != null'>
             and seb.src_id = #{data.srcId}
+
         </if>
-        <if test="data.boxbelongsTo != null and data.boxbelongsTo != ''">
-            and seb.box_belongs_to = #{data.boxbelongsTo}
+        <if test="data.boxBelongsTo != null and data.boxBelongsTo != ''">
+            and seb.box_belongs_to = #{data.boxBelongsTo}
         </if>
         <if test='data.examine != null and data.examine != "" and data.examine == "1"'>
             and seb.status = 3
@@ -202,7 +204,8 @@
         seb.corp_source AS corpSource,
         seb.ocean_freight_dr AS oceanFreightDr,
         seb.ocean_freight_cr AS oceanFreightCr,
-        seb.ocean_freight_profit AS oceanFreightProfit
+        seb.ocean_freight_profit AS oceanFreightProfit,
+        seb.box_belongs_to as boxBelongsTo
         FROM
         los_finance_profit seb
         WHERE
@@ -248,8 +251,8 @@
         <if test='data.srcId != null'>
             and seb.src_id = #{data.srcId}
         </if>
-        <if test="data.boxbelongsTo != null and data.boxbelongsTo != ''">
-            and seb.box_belongs_to = #{data.boxbelongsTo}
+        <if test="data.boxBelongsTo != null and data.boxBelongsTo != ''">
+            and seb.box_belongs_to = #{data.boxBelongsTo}
         </if>
         <if test='data.examine != null and data.examine != "" and data.examine == "1"'>
             and seb.status = 3