Explorar el Código

新增删除抵扣接口

anderx hace 2 años
padre
commit
dfeb163078

+ 2 - 2
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -436,7 +436,7 @@
     select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.type_other typeOther,
     a.attachment_url attachmentUrl ,a.real_amount realAmount,e.contract_no contractNo,tm.buyer_name buyerName,
     a.secondary_type secondaryType, a.secondary_type_other secondaryTypeOther,a.status,a.user_names userNames,
-    date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,a.user_names userNames,
+    date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,a.user_names userNames,a.amount,
     date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr,
     <if test="processStatus ==1">
       eae.type eaeType,
@@ -575,7 +575,7 @@
   </select>
 
   <select id="selectExpenseAccountTotalAmount" resultType="java.math.BigDecimal">
-    select sum(a.total_amount) totalAmount
+    select sum(a.amount) totalAmount
     from expense_account a
     <if test="type !=null">
       right join  (select a.id

+ 8 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountBo.java

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 public class OutExpenseAccountBo {
     private Integer id;
     private BigDecimal totalAmount;
+    private BigDecimal amount;
     private Integer type;
     private String typeOther;
     private Integer secondaryType;
@@ -32,6 +33,13 @@ public class OutExpenseAccountBo {
     private Integer examine;
     private Integer realAmount;
 
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
 
     public Integer getMainId() {
         return mainId;