瀏覽代碼

修改发票管理问题

y 2 年之前
父節點
當前提交
1d750f5360

+ 1 - 1
src/main/java/com/ydtech/modules/inv/controller/InvAccountIncoiceController.java

@@ -86,7 +86,7 @@ public class InvAccountIncoiceController {
 
         InvAccountIncoiceResult invAccountIncoiceResult = new InvAccountIncoiceResult();
         invAccountIncoiceResult.setRecords(invAccountIncoicePage.getRecords());
-        invAccountIncoiceResult.setPages(invAccountIncoice.getPageNo());
+        invAccountIncoiceResult.setCurrent(invAccountIncoice.getPageNo());
         invAccountIncoiceResult.setTotal(invAccountIncoicePage.getTotal());
         invAccountIncoiceResult.setSize(invAccountIncoice.getPageSize());
 

+ 1 - 1
src/main/java/com/ydtech/modules/inv/model/InvAccountIncoiceResult.java

@@ -13,7 +13,7 @@ import java.util.List;
 public class InvAccountIncoiceResult {
     private long size;
     private long total;
-    private long pages;
+    private long current;
     private List<InvAccountIncoice> records;
 
     @ApiModelProperty("开票金额总和")

+ 0 - 1
src/main/java/com/ydtech/modules/inv/service/impl/InvAccountServiceImpl.java

@@ -119,7 +119,6 @@ public class InvAccountServiceImpl extends ServiceImpl<InvAccountMapper, InvAcco
                 }
                 if (invAccount.getBusinessQuality().equals("3")) {
                     invAccount.setQuarterAmountExcess(null);
-                    invAccount.setSumInvoicingAmount(null);
                     invAccount.setInvoicingAmountExcess(null);
                 }
             }

+ 0 - 5
src/main/resources/mapper/modules/inv/InvAccountMapper.xml

@@ -129,7 +129,6 @@
         select a.account_id, SUM(b.no_has_tax) as sum_invoicing_amount
         from inv_account a
         left join inv_account_incoice b on a.account_id = b.account_id
-        left join inv_account_card c on a.account_id = c.account_id
         where
         a.del_flag = '0'
         <if test="account.accountId != null and account.accountId != ''">
@@ -144,11 +143,7 @@
         <if test="account.accountQuality!= null and account.accountQuality!= ''">
             and c.account_quality like concat('%',#{account.accountQuality},'%')
         </if>
-        <if test="account.bankCardNum!= null and account.bankCardNum!= ''">
-            and c.bank_card_num like concat('%',#{account.bankCardNum},'%')
-        </if>
         GROUP BY a.account_id
-
     </select>
 
     <select id="selectAccountsList" resultMap="BaseResultMap">