修改了打款的列表

hx-account/src/main/java/com/fjhx/account/controller/account/AccountDeptRunningWaterDetailController.java

@@ -51,8 +51,8 @@ public class AccountDeptRunningWaterDetailController {
      * 资金流水分拆部门表新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody List<AccountDeptRunningWaterDetailDto> accountDeptRunningWaterDetailDto) {
-        accountDeptRunningWaterDetailService.add(accountDeptRunningWaterDetailDto);
+    public void add(@RequestBody AccountRunningWaterVo accountRunningWaterVo) {
+        accountDeptRunningWaterDetailService.add(accountRunningWaterVo);
     }
 
     /**

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountDeptRunningWaterSelectDto.java

@@ -13,5 +13,23 @@ import lombok.Setter;
 @Getter
 @Setter
 public class AccountDeptRunningWaterSelectDto extends BaseSelectDto {
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
 
+    /**
+     * 收支类型：10 收入，20支出
+     */
+    private String status;
+
+    /**
+     * 模糊查询时使用
+     */
+    private String keyword;
+
+    /**
+     *是否分拆（10未分拆  20 已分拆）
+     */
+    private String type;
 }

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountPaymentDto.java

@@ -22,4 +22,24 @@ public class AccountPaymentDto extends AccountPayment {
      */
     private List<ObsFile> fileList;
 
+    /**
+     * 账户名
+     */
+    private String name;
+
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountOpening;
+
+
+
+
+
 }

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountRunningWaterVo.java

@@ -38,7 +38,12 @@ public class AccountRunningWaterVo extends AccountRunningWater {
     private String deptName;
 
     /**
-     *
+     * 资金流水-部门表ID
+     */
+    private Long accountDeptRunningWaterId;
+
+    /**
+     *资金流水-部门关联表列表
      */
     private List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList;
 

hx-account/src/main/java/com/fjhx/account/service/account/AccountDeptRunningWaterDetailService.java

@@ -34,7 +34,7 @@ public interface AccountDeptRunningWaterDetailService extends BaseService<Accoun
     /**
      * 资金流水分拆部门表新增
      */
-    void add(List<AccountDeptRunningWaterDetailDto> accountDeptRunningWaterDetailDto);
+    void add(AccountRunningWaterVo accountRunningWaterVo);
 
     /**
      * 资金流水分拆部门表编辑

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

@@ -65,12 +65,35 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
         List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList = this.list(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
                 .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountDeptRunningWater.getId()));
 
+        //插入资金流水分拆部门表明细信息
         accountRunningWaterVo.setAccountDeptRunningWaterDetailList(accountDeptRunningWaterDetailList);
+        //插入资金流水-部门关联表ID
+        accountRunningWaterVo.setAccountDeptRunningWaterId(accountDeptRunningWater.getId());
         return accountRunningWaterVo;
     }
 
+    /**
+     * 资金流水分拆部门表新增
+     */
     @Override
-    public void add(List<AccountDeptRunningWaterDetailDto> accountDeptRunningWaterDetailDto) {
+    public void add(AccountRunningWaterVo accountRunningWaterVo) {
+        //修改资金流水-账户表的的分拆类型为已分拆
+        AccountDeptRunningWater accountDeptRunningWater = new AccountDeptRunningWater();
+        accountDeptRunningWater.setId(accountRunningWaterVo.getAccountDeptRunningWaterId());
+        accountDeptRunningWater.setType("20");
+        accountDeptRunningWaterService.updateById(accountDeptRunningWater);
+
+        //删除资金流水分拆部门表数据
+        this.remove(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
+                .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId,accountRunningWaterVo.getAccountDeptRunningWaterId()));
+
+        //添加资金流水分拆部门表数据
+        List<AccountDeptRunningWaterDetail> deptRunningWaterDetailList = accountRunningWaterVo.getAccountDeptRunningWaterDetailList();
+
+        deptRunningWaterDetailList.forEach(deptRunningWaterDetail->deptRunningWaterDetail
+                .setDeptRunningWaterId(accountRunningWaterVo.getAccountDeptRunningWaterId()));
+
+        this.saveBatch(deptRunningWaterDetailList);
 
     }
 

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

@@ -12,6 +12,7 @@ import com.fjhx.account.service.account.AccountDeptRunningWaterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +45,13 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
     @Override
     public Page<AccountRunningWaterVo> getPage(AccountDeptRunningWaterSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arw.status", dto.getStatus());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arw.currency", dto.getCurrency());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()),"adrw.type",dto.getType());
+        if (StringUtils.isNotEmpty(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);
         //切换数据源
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);

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

@@ -5,15 +5,15 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
+import com.fjhx.account.entity.account.enums.PaymentTypeEnum;
 import com.fjhx.account.entity.account.po.AccountPayment;
 import com.fjhx.account.entity.account.po.AccountRemainder;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
 import com.fjhx.account.mapper.account.AccountPaymentMapper;
-import com.fjhx.account.service.account.AccountManagementService;
-import com.fjhx.account.service.account.AccountPaymentService;
+import com.fjhx.account.service.account.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.account.service.account.AccountRemainderService;
-import com.fjhx.account.service.account.AccountRequestFundsDetailService;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
@@ -60,6 +60,9 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
     @Autowired
     private AccountRemainderService accountRemainderService;
 
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+
     @Override
     public Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
@@ -144,6 +147,9 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         //修改账户-余额表的中余额
         accountRemainder.setRemainder( accountRemainder.getRemainder().subtract(accountPaymentDto.getAmount()));
         accountRemainderService.add(accountRemainder);
+
+        //添加资金流水表的数据
+        addAccountRunningWater(accountPaymentDto);
     }
 
     @Override
@@ -156,5 +162,24 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         this.removeById(id);
     }
 
+    /**
+     * 添加资金流水表的数据
+     */
+    private void  addAccountRunningWater(AccountPaymentDto accountPaymentDto){
+
+        AccountRunningWater accountRunningWater = new AccountRunningWater();
+        accountRunningWater.setAccountManagementId(accountPaymentDto.getAccountManagementId());
+        accountRunningWater.setStatus("20");
+        accountRunningWater.setAmount(accountPaymentDto.getAmount());
+        accountRunningWater.setCurrency(accountPaymentDto.getCurrency());
+        accountRunningWater.setOpeningBank(accountPaymentDto.getOpeningBank());
+        accountRunningWater.setAccountOpening(accountPaymentDto.getAccountOpening());
+        accountRunningWater.setName(accountPaymentDto.getName());
+        accountRunningWater.setTransactionTime(accountPaymentDto.getExpensesTime());
+        accountRunningWater.setRemarks(accountPaymentDto.getRemark());
+        accountRunningWaterService.save(accountRunningWater);
+
+    }
+
 
 }

hx-account/src/main/resources/mapper/account/AccountDeptRunningWaterMapper.xml

@@ -23,7 +23,7 @@
             adrw.dept_id
         from account_running_water arw
                  left join  account_management am on arw.account_management_id = am.id
-                 left joinaccount_dept_running_water adrw on arw.id = adrw.running_water_id
+                 left join account_dept_running_water adrw on arw.id = adrw.running_water_id
             ${ew.customSqlSegment}
     </select>