Merge remote-tracking branch 'origin/master'

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);
     }
 

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;
+
     /**
      * 开户银行
      */

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());

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountManagementServiceImpl.java

@@ -46,12 +46,13 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         LambdaQueryWrapper<AccountManagement> wrapper = Wrappers.<AccountManagement>lambdaQuery();
         //根据关键字查询（查询的字段有账户别名、账户名称、账号）
         if (StringUtils.isNotEmpty(dto.getKeyword())){
-            wrapper.like(AccountManagement::getName,dto.getKeyword());
-            wrapper.like(AccountManagement::getAlias,dto.getKeyword());
-            wrapper.like(AccountManagement::getAccountOpening,dto.getOpeningBank());
+            wrapper.and(wrapper1 ->{
+                wrapper1.like(AccountManagement::getName,dto.getKeyword()).or()
+                .like(AccountManagement::getAlias,dto.getKeyword()).or()
+                .like(AccountManagement::getAccountOpening,dto.getOpeningBank()).or()
+                        .like(AccountManagement::getOpeningBank,dto.getKeyword());
+            } );
         }
-        //根据开户银行查询
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getOpeningBank()),AccountManagement::getOpeningBank,dto.getOpeningBank());
         Page<AccountManagementVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -35,7 +35,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arw.status", dto.getStatus());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arw.currency", dto.getCurrency());
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
-            wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("am.name", dto.getKeyword()));
+            wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
         }
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;

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,