修改了打款的列表

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

@@ -1,6 +1,7 @@
 package com.fjhx.account.controller.account;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.common.constant.SourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -32,17 +33,11 @@ public class AccountDeptRunningWaterController {
      * 部门-资金流水关联表分页
      */
     @PostMapping("/page")
-    public Page<AccountDeptRunningWaterVo> page(@RequestBody AccountDeptRunningWaterSelectDto dto) {
+    public Page<AccountRunningWaterVo> page(@RequestBody AccountDeptRunningWaterSelectDto dto) {
         return accountDeptRunningWaterService.getPage(dto);
     }
 
-    /**
-     * 部门-资金流水关联表明细
-     */
-    @PostMapping("/detail")
-    public AccountDeptRunningWaterVo detail(@RequestBody BaseSelectDto dto) {
-        return accountDeptRunningWaterService.detail(dto.getId());
-    }
+
 
     /**
      * 部门-资金流水关联表新增
@@ -52,20 +47,4 @@ public class AccountDeptRunningWaterController {
         accountDeptRunningWaterService.add(accountDeptRunningWaterDto);
     }
 
-    /**
-     * 部门-资金流水关联表编辑
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody AccountDeptRunningWaterDto accountDeptRunningWaterDto) {
-        accountDeptRunningWaterService.edit(accountDeptRunningWaterDto);
-    }
-
-    /**
-     * 部门-资金流水关联表删除
-     */
-    @PostMapping("/delete")
-    public void delete(@RequestBody BaseSelectDto dto) {
-        accountDeptRunningWaterService.delete(dto.getId());
-    }
-
 }

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

@@ -1,5 +1,8 @@
 package com.fjhx.account.controller.account;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
+import com.fjhx.common.constant.SourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
@@ -9,6 +12,8 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.account.service.account.AccountDeptRunningWaterDetailService;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -18,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author
  * @since 2023-04-13
  */
+@DS(SourceConstant.ACCOUNT)
 @RestController
 @RequestMapping("/accountDeptRunningWaterDetail")
 public class AccountDeptRunningWaterDetailController {
@@ -37,7 +43,7 @@ public class AccountDeptRunningWaterDetailController {
      * 资金流水分拆部门表明细
      */
     @PostMapping("/detail")
-    public AccountDeptRunningWaterDetailVo detail(@RequestBody BaseSelectDto dto) {
+    public AccountRunningWaterVo detail(@RequestBody BaseSelectDto dto) {
         return accountDeptRunningWaterDetailService.detail(dto.getId());
     }
 
@@ -45,7 +51,7 @@ public class AccountDeptRunningWaterDetailController {
      * 资金流水分拆部门表新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto) {
+    public void add(@RequestBody List<AccountDeptRunningWaterDetailDto> accountDeptRunningWaterDetailDto) {
         accountDeptRunningWaterDetailService.add(accountDeptRunningWaterDetailDto);
     }
 

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

@@ -1,9 +1,13 @@
 package com.fjhx.account.entity.account.vo;
 
+import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
+import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 账户资金流水表列表查询返回值实体
  *
@@ -18,4 +22,24 @@ public class AccountRunningWaterVo extends AccountRunningWater {
      */
     private String accountManagementName;
 
+    /**
+     * 是否分拆(10 未分拆，20 已分拆 )
+     */
+    private String type;
+
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     *
+     */
+    private List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList;
+
 }

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountDeptRunningWaterMapper.java

@@ -5,6 +5,7 @@ import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,6 +23,6 @@ public interface AccountDeptRunningWaterMapper extends BaseMapper<AccountDeptRun
     /**
      * 部门-资金流水关联表分页
      */
-    Page<AccountDeptRunningWaterVo> getPage(@Param("page") Page<Object> page,  QueryWrapper<Object> wrapper);
+    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page, QueryWrapper<Object> wrapper);
 
 }

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

@@ -1,12 +1,15 @@
 package com.fjhx.account.service.account;
 
 import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
 import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailSelectDto;
 import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailDto;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -26,12 +29,12 @@ public interface AccountDeptRunningWaterDetailService extends BaseService<Accoun
     /**
      * 资金流水分拆部门表明细
      */
-    AccountDeptRunningWaterDetailVo detail(Long id);
+    AccountRunningWaterVo detail(Long id);
 
     /**
      * 资金流水分拆部门表新增
      */
-    void add(AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto);
+    void add(List<AccountDeptRunningWaterDetailDto> accountDeptRunningWaterDetailDto);
 
     /**
      * 资金流水分拆部门表编辑

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

@@ -1,6 +1,7 @@
 package com.fjhx.account.service.account;
 
 import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
@@ -21,7 +22,7 @@ public interface AccountDeptRunningWaterService extends BaseService<AccountDeptR
     /**
      * 部门-资金流水关联表分页
      */
-    Page<AccountDeptRunningWaterVo> getPage(AccountDeptRunningWaterSelectDto dto);
+    Page<AccountRunningWaterVo> getPage(AccountDeptRunningWaterSelectDto dto);
 
     /**
      * 部门-资金流水关联表明细

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

@@ -1,9 +1,16 @@
 package com.fjhx.account.service.account.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.mapper.account.AccountDeptRunningWaterDetailMapper;
 import com.fjhx.account.service.account.AccountDeptRunningWaterDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.service.account.AccountDeptRunningWaterService;
+import com.fjhx.account.service.account.AccountRunningWaterService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
@@ -12,6 +19,8 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -23,6 +32,11 @@ import cn.hutool.core.bean.BeanUtil;
  */
 @Service
 public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<AccountDeptRunningWaterDetailMapper, AccountDeptRunningWaterDetail> implements AccountDeptRunningWaterDetailService {
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+
+    @Autowired
+    private AccountDeptRunningWaterService accountDeptRunningWaterService;
 
     @Override
     public Page<AccountDeptRunningWaterDetailVo> getPage(AccountDeptRunningWaterDetailSelectDto dto) {
@@ -32,16 +46,30 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
         return page;
     }
 
+    /**
+     * 资金流水分拆部门表明细
+     */
     @Override
-    public AccountDeptRunningWaterDetailVo detail(Long id) {
-        AccountDeptRunningWaterDetail AccountDeptRunningWaterDetail = this.getById(id);
-        AccountDeptRunningWaterDetailVo result = BeanUtil.toBean(AccountDeptRunningWaterDetail, AccountDeptRunningWaterDetailVo.class);
-        return result;
+    public AccountRunningWaterVo detail(Long id) {
+        //查询资金流水信息
+        AccountRunningWater accountRunningWater = accountRunningWaterService.getById(id);
+        AccountRunningWaterVo accountRunningWaterVo = BeanUtil.toBean(accountRunningWater, AccountRunningWaterVo.class);
+
+        //查询资金流水-部门关联表的信息(一个流水对应一个部门)
+        AccountDeptRunningWater accountDeptRunningWater = accountDeptRunningWaterService.getOne(Wrappers.<AccountDeptRunningWater>lambdaQuery()
+                .eq(AccountDeptRunningWater::getRunningWaterId, accountRunningWater.getId()));
+
+        //查询资金流水分拆部门表明细
+        List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList = this.list(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
+                .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountDeptRunningWater.getId()));
+
+        accountRunningWaterVo.setAccountDeptRunningWaterDetailList(accountDeptRunningWaterDetailList);
+        return accountRunningWaterVo;
     }
 
     @Override
-    public void add(AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto) {
-        this.save(accountDeptRunningWaterDetailDto);
+    public void add(List<AccountDeptRunningWaterDetailDto> accountDeptRunningWaterDetailDto) {
+
     }
 
     @Override

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

@@ -1,11 +1,19 @@
 package com.fjhx.account.service.account.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+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.po.AccountDeptRunningWater;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.mapper.account.AccountDeptRunningWaterMapper;
 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.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
@@ -14,6 +22,10 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * <p>
@@ -26,11 +38,26 @@ import cn.hutool.core.bean.BeanUtil;
 @Service
 public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptRunningWaterMapper, AccountDeptRunningWater> implements AccountDeptRunningWaterService {
 
+    @Autowired
+    private ISysDeptService sysDeptService;
+
     @Override
-    public Page<AccountDeptRunningWaterVo> getPage(AccountDeptRunningWaterSelectDto dto) {
+    public Page<AccountRunningWaterVo> getPage(AccountDeptRunningWaterSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
-        Page<AccountDeptRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+        //查询部门信息
+        List<SysDept> sysDeptList = sysDeptService.list();
+        Map<Long, List<SysDept>> sysDeptMap = sysDeptList.stream().collect(Collectors.groupingBy(SysDept::getDeptId));
 
+        List<AccountRunningWaterVo> records = page.getRecords();
+        for (AccountRunningWaterVo record : records) {
+            List<SysDept> sysDepts = sysDeptMap.get(record.getDeptId());
+            if (ObjectUtil.isNotEmpty(sysDepts)) {
+                record.setDeptName(sysDepts.get(0).getDeptName());
+            }
+        }
         return page;
     }
 
@@ -41,9 +68,17 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
         return result;
     }
 
+    /**
+     * 部门-资金流水关联表新增
+     */
     @Override
     public void add(AccountDeptRunningWaterDto accountDeptRunningWaterDto) {
-        this.save(accountDeptRunningWaterDto);
+        if (ObjectUtil.isNotEmpty(accountDeptRunningWaterDto.getId())){
+            this.updateById(accountDeptRunningWaterDto);
+        }else {
+            this.save(accountDeptRunningWaterDto);
+        }
+
     }
 
     @Override

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

@@ -1,17 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.account.mapper.account.AccountDeptRunningWaterMapper">
-    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo">
+    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
         select
-            adrw.id,
-            adrw.dept_id,
-            adrw.running_water_id,
+            arw.id,
+            arw.account_management_id,
+            arw.status,
+            arw.amount,
+            arw.currency,
+            arw.name,
+            arw.received,
+            arw.opening_bank,
+            arw.account_opening,
+            arw.transaction_time,
+            arw.remarks,
+            arw.create_user,
+            arw.create_time,
+            arw.update_user,
+            arw.update_time,
+            am.alias accountManagementName,
             adrw.type,
-            adrw.create_user,
-            adrw.create_time,
-            adrw.update_user,
-            adrw.update_time
-        from account_dept_running_water adrw
+            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
             ${ew.customSqlSegment}
     </select>