交易总额添加

precision-effect-system/src/main/java/com/zehong/system/domain/TradeExpensesStatistics.java

@@ -15,6 +15,9 @@ public class TradeExpensesStatistics {
     @Excel(name = "条数")
     private int countNum;
 
+    @Excel(name = "交易总额",isStatistics = true)
+    private BigDecimal tradeTotal;
+
     @Excel(name = "交易支出总额",isStatistics = true)
     private BigDecimal totalDealPrice;
 
@@ -48,6 +51,14 @@ public class TradeExpensesStatistics {
         this.countNum = countNum;
     }
 
+    public BigDecimal getTradeTotal() {
+        return tradeTotal;
+    }
+
+    public void setTradeTotal(BigDecimal tradeTotal) {
+        this.tradeTotal = tradeTotal;
+    }
+
     public BigDecimal getTotalDealPrice() {
         return totalDealPrice;
     }

precision-effect-system/src/main/java/com/zehong/system/domain/TradeIncomeStatistics.java

@@ -15,6 +15,9 @@ public class TradeIncomeStatistics {
     @Excel(name = "条数")
     private int countNum;
 
+    @Excel(name = "交易总额",isStatistics = true)
+    private BigDecimal tradeTotal;
+
     @Excel(name = "交易收入总额",isStatistics = true)
     private BigDecimal totalDealPrice;
 
@@ -46,6 +49,14 @@ public class TradeIncomeStatistics {
         this.countNum = countNum;
     }
 
+    public BigDecimal getTradeTotal() {
+        return tradeTotal;
+    }
+
+    public void setTradeTotal(BigDecimal tradeTotal) {
+        this.tradeTotal = tradeTotal;
+    }
+
     public BigDecimal getTotalDealPrice() {
         return totalDealPrice;
     }

precision-effect-system/src/main/java/com/zehong/system/domain/vo/DeptTradeExpensesStatisticsVo.java

@@ -12,6 +12,9 @@ public class DeptTradeExpensesStatisticsVo {
     @Excel(name = "条数")
     private int countNum;
 
+    @Excel(name = "交易总额",isStatistics = true)
+    private BigDecimal tradeTotal;
+
     @Excel(name = "交易支出总额",isStatistics = true)
     private BigDecimal totalDealPrice;
 
@@ -32,6 +35,14 @@ public class DeptTradeExpensesStatisticsVo {
         this.countNum = countNum;
     }
 
+    public BigDecimal getTradeTotal() {
+        return tradeTotal;
+    }
+
+    public void setTradeTotal(BigDecimal tradeTotal) {
+        this.tradeTotal = tradeTotal;
+    }
+
     public BigDecimal getTotalDealPrice() {
         return totalDealPrice;
     }

precision-effect-system/src/main/java/com/zehong/system/domain/vo/DeptTradeIncomeStatisticsVo.java

@@ -12,6 +12,9 @@ public class DeptTradeIncomeStatisticsVo {
     @Excel(name = "条数")
     private int countNum;
 
+    @Excel(name = "交易总额",isStatistics = true)
+    private BigDecimal tradeTotal;
+
     @Excel(name = "交易收入总额",isStatistics = true)
     private BigDecimal totalDealPrice;
 
@@ -31,6 +34,14 @@ public class DeptTradeIncomeStatisticsVo {
         this.countNum = countNum;
     }
 
+    public BigDecimal getTradeTotal() {
+        return tradeTotal;
+    }
+
+    public void setTradeTotal(BigDecimal tradeTotal) {
+        this.tradeTotal = tradeTotal;
+    }
+
     public BigDecimal getTotalDealPrice() {
         return totalDealPrice;
     }

precision-effect-system/src/main/java/com/zehong/system/domain/vo/TradeExpensesStatisticsDetailExportVo.java

@@ -27,6 +27,9 @@ public class TradeExpensesStatisticsDetailExportVo {
     @Excel(name = "项目状态",dictType = "t_transaction_project_status")
     private String tradeStatus;
 
+    @Excel(name = "交易总额")
+    private BigDecimal tradeTotal;
+
     @Excel(name = "交易成交价")
     private BigDecimal dealPrice;
 
@@ -86,6 +89,14 @@ public class TradeExpensesStatisticsDetailExportVo {
         this.tradeStatus = tradeStatus;
     }
 
+    public BigDecimal getTradeTotal() {
+        return tradeTotal;
+    }
+
+    public void setTradeTotal(BigDecimal tradeTotal) {
+        this.tradeTotal = tradeTotal;
+    }
+
     public BigDecimal getDealPrice() {
         return dealPrice;
     }

precision-effect-system/src/main/java/com/zehong/system/domain/vo/TradeIncomeStatisticsDetailExportVo.java

@@ -27,6 +27,9 @@ public class TradeIncomeStatisticsDetailExportVo {
     @Excel(name = "项目状态",dictType = "t_transaction_project_status")
     private String tradeStatus;
 
+    @Excel(name = "交易总额")
+    private BigDecimal tradeTotal;
+
     @Excel(name = "交易成交价")
     private BigDecimal dealPrice;
 
@@ -86,6 +89,14 @@ public class TradeIncomeStatisticsDetailExportVo {
         this.tradeStatus = tradeStatus;
     }
 
+    public BigDecimal getTradeTotal() {
+        return tradeTotal;
+    }
+
+    public void setTradeTotal(BigDecimal tradeTotal) {
+        this.tradeTotal = tradeTotal;
+    }
+
     public BigDecimal getDealPrice() {
         return dealPrice;
     }

precision-effect-system/src/main/resources/mapper/business/TStatisticsMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyDeptName" column="apply_dept_name"/>
         <result property="applyName" column="apply_name"/>
         <result property="countNum" column="count_num"/>
+        <result property="tradeTotal" column="trade_total"/>
         <result property="totalDealPrice" column="total_deal_price"/>
         <result property="applyDeptId" column="apply_dept_id"/>
         <result property="applyId" column="apply_id"/>
@@ -17,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="tradeDeptName" column="trade_dept_name"/>
         <result property="tradeTransactorName" column="trade_transactor_name"/>
         <result property="countNum" column="count_num"/>
+        <result property="tradeTotal" column="trade_total"/>
         <result property="totalDealPrice" column="total_deal_price"/>
         <result property="tradeDeptId" column="trade_dept_id"/>
         <result property="tradeTransactor" column="trade_transactor"/>
@@ -48,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           dept.dept_name AS apply_dept_name,
           us.nick_name AS apply_name,
           count(1) AS count_num,
+          ROUND(IFNULL(sum(project.trade_total),0),2) AS trade_total,
           ROUND(IFNULL(sum(project.deal_price),0),2) AS total_deal_price,
           project.apply_dept_id,
           project.apply_id
@@ -80,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           dept.dept_name AS trade_dept_name,
           us.nick_name AS trade_transactor_name,
           count(1) AS count_num,
+          ROUND(IFNULL(sum(project.trade_total),0),2) AS trade_total,
           ROUND(IFNULL(sum(project.deal_price),0),2) AS total_deal_price,
           project.trade_dept_id,
           project.trade_transactor

precision-effect-web/src/views/statistics/tradeStatistics/components/ExpensesTableList.vue

@@ -8,6 +8,7 @@
             <span class="detail" @click="detail(scope.row)">{{scope.row.countNum}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="交易总额" align="center" prop="tradeTotal" />
         <el-table-column label="交易支出总额" align="center" prop="totalDealPrice" />
       </el-table>
 
@@ -42,6 +43,7 @@
           </el-table-column>
           <el-table-column label="申请时间" align="center" prop="createTime" width="150px"/>
           <el-table-column label="项目状态" align="center" prop="tradeStatus" :formatter="getTradeStatus" :show-overflow-tooltip="true"/>
+          <el-table-column label="交易总价" align="center" prop="tradeTotal" />
           <el-table-column label="交易成交价" align="center" prop="dealPrice" />
         </el-table>
         <pagination
@@ -154,7 +156,8 @@
           }
           const values = data.map((item) => Number(item[column.property]));
           if (
-            column.property === "totalDealPrice"
+            column.property === "totalDealPrice" ||
+            column.property === "tradeTotal"
           ) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);

precision-effect-web/src/views/statistics/tradeStatistics/components/IncomeTableList.vue

@@ -8,6 +8,7 @@
           <span class="detail" @click="detail(scope.row)">{{scope.row.countNum}}</span>
         </template>
       </el-table-column>
+      <el-table-column label="交易总额" align="center" prop="tradeTotal" />
       <el-table-column label="交易收入总额" align="center" prop="totalDealPrice" />
     </el-table>
 
@@ -42,6 +43,7 @@
         </el-table-column>
         <el-table-column label="申请时间" align="center" prop="createTime" width="150px"/>
         <el-table-column label="项目状态" align="center" prop="tradeStatus" :formatter="getTradeStatus" :show-overflow-tooltip="true"/>
+        <el-table-column label="交易总价" align="center" prop="tradeTotal" />
         <el-table-column label="交易成交价" align="center" prop="dealPrice" />
       </el-table>
       <pagination
@@ -155,7 +157,8 @@
           }
           const values = data.map((item) => Number(item[column.property]));
           if (
-            column.property === "totalDealPrice"
+            column.property === "totalDealPrice" ||
+            column.property === "tradeTotal"
           ) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr);