Quellcode durchsuchen

修改了打款的列表

wxf vor 2 Jahren
Ursprung
Commit
82f0608069

+ 2 - 1
hx-account/src/main/java/com/fjhx/account/controller/account/AccountRunningWaterController.java

@@ -1,6 +1,7 @@
 package com.fjhx.account.controller.account;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.common.constant.SourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,7 +57,7 @@ public class AccountRunningWaterController {
      * 账户资金流水表编辑
      */
     @PostMapping("/edit")
-    public void edit(@RequestBody AccountRunningWaterDto accountRunningWaterDto) {
+    public void edit(@RequestBody AccountRunningWater accountRunningWaterDto) {
         accountRunningWaterService.edit(accountRunningWaterDto);
     }
 

+ 6 - 0
hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountRunningWater.java

@@ -45,6 +45,12 @@ public class AccountRunningWater extends BasePo {
      */
     private String name;
 
+
+    /**
+     * 合同到账(10:是,20:否)
+     */
+    private String received;
+
     /**
      * 开户银行
      */

+ 1 - 1
hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -74,7 +74,7 @@ public class AccountRequestFundsFlow extends FlowDelegate {
             //添加请款详情表的信息
             accountRequestFundsDetailService.saveBatch(accountRequestFundsDetailList);
         }
-        //删除流程
+        //删除附件
         ObsFileUtil.removeFile(accountRequestFundsDto.getId());
         //添加附件信息
         ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(),accountRequestFundsDto.getId());

+ 2 - 0
hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -9,6 +9,7 @@
             arw.amount,
             arw.currency,
             arw.name,
+            arw.received,
             arw.opening_bank,
             arw.account_opening,
             arw.transaction_time,
@@ -30,6 +31,7 @@
             arw.amount,
             arw.currency,
             arw.name,
+            arw.received,
             arw.opening_bank,
             arw.account_opening,
             arw.transaction_time,