修改了打款的列表

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

@@ -0,0 +1,71 @@
+package com.fjhx.account.controller.account;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+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.AccountDeptRunningWaterVo;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterSelectDto;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.service.account.AccountDeptRunningWaterService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 部门-资金流水关联表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@DS(SourceConstant.ACCOUNT)
+@RestController
+@RequestMapping("/accountDeptRunningWater")
+public class AccountDeptRunningWaterController {
+
+    @Autowired
+    private AccountDeptRunningWaterService accountDeptRunningWaterService;
+
+    /**
+     * 部门-资金流水关联表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountDeptRunningWaterVo> page(@RequestBody AccountDeptRunningWaterSelectDto dto) {
+        return accountDeptRunningWaterService.getPage(dto);
+    }
+
+    /**
+     * 部门-资金流水关联表明细
+     */
+    @PostMapping("/detail")
+    public AccountDeptRunningWaterVo detail(@RequestBody BaseSelectDto dto) {
+        return accountDeptRunningWaterService.detail(dto.getId());
+    }
+
+    /**
+     * 部门-资金流水关联表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountDeptRunningWaterDto accountDeptRunningWaterDto) {
+        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

@@ -0,0 +1,68 @@
+package com.fjhx.account.controller.account;
+
+import org.springframework.web.bind.annotation.*;
+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 com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.service.account.AccountDeptRunningWaterDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 资金流水分拆部门表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@RestController
+@RequestMapping("/accountDeptRunningWaterDetail")
+public class AccountDeptRunningWaterDetailController {
+
+    @Autowired
+    private AccountDeptRunningWaterDetailService accountDeptRunningWaterDetailService;
+
+    /**
+     * 资金流水分拆部门表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountDeptRunningWaterDetailVo> page(@RequestBody AccountDeptRunningWaterDetailSelectDto dto) {
+        return accountDeptRunningWaterDetailService.getPage(dto);
+    }
+
+    /**
+     * 资金流水分拆部门表明细
+     */
+    @PostMapping("/detail")
+    public AccountDeptRunningWaterDetailVo detail(@RequestBody BaseSelectDto dto) {
+        return accountDeptRunningWaterDetailService.detail(dto.getId());
+    }
+
+    /**
+     * 资金流水分拆部门表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto) {
+        accountDeptRunningWaterDetailService.add(accountDeptRunningWaterDetailDto);
+    }
+
+    /**
+     * 资金流水分拆部门表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto) {
+        accountDeptRunningWaterDetailService.edit(accountDeptRunningWaterDetailDto);
+    }
+
+    /**
+     * 资金流水分拆部门表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountDeptRunningWaterDetailService.delete(dto.getId());
+    }
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 资金流水分拆部门表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+public class AccountDeptRunningWaterDetailDto extends AccountDeptRunningWaterDetail {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 资金流水分拆部门表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+public class AccountDeptRunningWaterDetailSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 部门-资金流水关联表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+public class AccountDeptRunningWaterDto extends AccountDeptRunningWater {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 部门-资金流水关联表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+public class AccountDeptRunningWaterSelectDto extends BaseSelectDto {
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountDeptRunningWater.java

@@ -0,0 +1,37 @@
+package com.fjhx.account.entity.account.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 部门-资金流水关联表
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+@TableName("account_dept_running_water")
+public class AccountDeptRunningWater extends BasePo {
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 资金流水表ID
+     */
+    private Long runningWaterId;
+
+    /**
+     * 是否分拆（10 未分拆，20 已分拆）
+     */
+    private String type;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/po/AccountDeptRunningWaterDetail.java

@@ -0,0 +1,43 @@
+package com.fjhx.account.entity.account.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 资金流水分拆部门表
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+@TableName("account_dept_running_water_detail")
+public class AccountDeptRunningWaterDetail extends BasePo {
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门-资金流水关联表ID
+     */
+    private Long deptRunningWaterId;
+
+    /**
+     * 分拆金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 资金流水分拆部门表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+public class AccountDeptRunningWaterDetailVo extends AccountDeptRunningWaterDetail {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 部门-资金流水关联表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+public class AccountDeptRunningWaterVo extends AccountDeptRunningWater {
+
+}

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

@@ -78,8 +78,7 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(),accountRequestFundsDto.getId());
 
 
-        //添加打款的数据
-        addPayment(accountRequestFundsDto);
+
         return accountRequestFundsDto.getId();
     }
 
@@ -94,12 +93,15 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         AccountRequestFundsService accountRequestFundsService = SpringUtil.getBean(AccountRequestFundsService.class);
         //通过业务ID查询申购数据
         AccountRequestFunds accountRequestFunds = accountRequestFundsService.getById(businessId);
+        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject( AccountRequestFundsDto.class);
         if(ObjectUtils.isEmpty(accountRequestFunds)){
             throw new ServiceException("请款表的数据不存在");
         }
         //修改申购状态为审批通过
         accountRequestFunds.setStatus(AccountRequestFundsStatusEnum.PASS.getKey());
         accountRequestFundsService.updateById(accountRequestFunds);
+        //添加打款的数据
+        addPayment(accountRequestFundsDto);
     }
 
     /**

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

@@ -0,0 +1,26 @@
+package com.fjhx.account.mapper.account;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 资金流水分拆部门表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+public interface AccountDeptRunningWaterDetailMapper extends BaseMapper<AccountDeptRunningWaterDetail> {
+
+    /**
+     * 资金流水分拆部门表分页
+     */
+    Page<AccountDeptRunningWaterDetailVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AccountDeptRunningWaterDetail> wrapper);
+
+}

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

@@ -0,0 +1,27 @@
+package com.fjhx.account.mapper.account;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 部门-资金流水关联表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+public interface AccountDeptRunningWaterMapper extends BaseMapper<AccountDeptRunningWater> {
+
+    /**
+     * 部门-资金流水关联表分页
+     */
+    Page<AccountDeptRunningWaterVo> getPage(@Param("page") Page<Object> page,  QueryWrapper<Object> wrapper);
+
+}

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

@@ -0,0 +1,46 @@
+package com.fjhx.account.service.account;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+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;
+
+
+/**
+ * <p>
+ * 资金流水分拆部门表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+public interface AccountDeptRunningWaterDetailService extends BaseService<AccountDeptRunningWaterDetail> {
+
+    /**
+     * 资金流水分拆部门表分页
+     */
+    Page<AccountDeptRunningWaterDetailVo> getPage(AccountDeptRunningWaterDetailSelectDto dto);
+
+    /**
+     * 资金流水分拆部门表明细
+     */
+    AccountDeptRunningWaterDetailVo detail(Long id);
+
+    /**
+     * 资金流水分拆部门表新增
+     */
+    void add(AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto);
+
+    /**
+     * 资金流水分拆部门表编辑
+     */
+    void edit(AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto);
+
+    /**
+     * 资金流水分拆部门表删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,46 @@
+package com.fjhx.account.service.account;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterSelectDto;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
+
+
+/**
+ * <p>
+ * 部门-资金流水关联表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+public interface AccountDeptRunningWaterService extends BaseService<AccountDeptRunningWater> {
+
+    /**
+     * 部门-资金流水关联表分页
+     */
+    Page<AccountDeptRunningWaterVo> getPage(AccountDeptRunningWaterSelectDto dto);
+
+    /**
+     * 部门-资金流水关联表明细
+     */
+    AccountDeptRunningWaterVo detail(Long id);
+
+    /**
+     * 部门-资金流水关联表新增
+     */
+    void add(AccountDeptRunningWaterDto accountDeptRunningWaterDto);
+
+    /**
+     * 部门-资金流水关联表编辑
+     */
+    void edit(AccountDeptRunningWaterDto accountDeptRunningWaterDto);
+
+    /**
+     * 部门-资金流水关联表删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,57 @@
+package com.fjhx.account.service.account.impl;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+import com.fjhx.account.mapper.account.AccountDeptRunningWaterDetailMapper;
+import com.fjhx.account.service.account.AccountDeptRunningWaterDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+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.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 资金流水分拆部门表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Service
+public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<AccountDeptRunningWaterDetailMapper, AccountDeptRunningWaterDetail> implements AccountDeptRunningWaterDetailService {
+
+    @Override
+    public Page<AccountDeptRunningWaterDetailVo> getPage(AccountDeptRunningWaterDetailSelectDto dto) {
+        IWrapper<AccountDeptRunningWaterDetail> wrapper = getWrapper();
+        wrapper.orderByDesc("adrwd", AccountDeptRunningWaterDetail::getId);
+        Page<AccountDeptRunningWaterDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public AccountDeptRunningWaterDetailVo detail(Long id) {
+        AccountDeptRunningWaterDetail AccountDeptRunningWaterDetail = this.getById(id);
+        AccountDeptRunningWaterDetailVo result = BeanUtil.toBean(AccountDeptRunningWaterDetail, AccountDeptRunningWaterDetailVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto) {
+        this.save(accountDeptRunningWaterDetailDto);
+    }
+
+    @Override
+    public void edit(AccountDeptRunningWaterDetailDto accountDeptRunningWaterDetailDto) {
+        this.updateById(accountDeptRunningWaterDetailDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

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

@@ -0,0 +1,59 @@
+package com.fjhx.account.service.account.impl;
+
+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.mapper.account.AccountDeptRunningWaterMapper;
+import com.fjhx.account.service.account.AccountDeptRunningWaterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ * 部门-资金流水关联表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Service
+public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptRunningWaterMapper, AccountDeptRunningWater> implements AccountDeptRunningWaterService {
+
+    @Override
+    public Page<AccountDeptRunningWaterVo> getPage(AccountDeptRunningWaterSelectDto dto) {
+        QueryWrapper<Object> wrapper = Wrappers.query();
+        Page<AccountDeptRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        return page;
+    }
+
+    @Override
+    public AccountDeptRunningWaterVo detail(Long id) {
+        AccountDeptRunningWater AccountDeptRunningWater = this.getById(id);
+        AccountDeptRunningWaterVo result = BeanUtil.toBean(AccountDeptRunningWater, AccountDeptRunningWaterVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(AccountDeptRunningWaterDto accountDeptRunningWaterDto) {
+        this.save(accountDeptRunningWaterDto);
+    }
+
+    @Override
+    public void edit(AccountDeptRunningWaterDto accountDeptRunningWaterDto) {
+        this.updateById(accountDeptRunningWaterDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

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

@@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.entity.account.po.AccountManagement;
 import com.fjhx.account.entity.account.po.AccountRemainder;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.mapper.account.AccountManagementMapper;
 import com.fjhx.account.service.account.AccountManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.service.account.AccountRemainderService;
+import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import org.apache.poi.util.StringUtil;
@@ -21,6 +23,7 @@ import com.fjhx.account.entity.account.dto.AccountManagementSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.account.entity.account.dto.AccountManagementDto;
 import cn.hutool.core.bean.BeanUtil;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -38,6 +41,9 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
     @Autowired
     private AccountRemainderService accountRemainderService;
 
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+
     /**
      * 账户-管理表分页
      */
@@ -76,6 +82,7 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
      * 账户-管理表新增
      */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void add(AccountManagementDto accountManagementDto) {
         //判断账户的别名是否已存在
         List<AccountManagement> accountManagements = this.list(Wrappers.<AccountManagement>lambdaQuery()
@@ -93,6 +100,7 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
      * 账户-管理表编辑
      */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void edit(AccountManagementDto accountManagementDto) {
         //判断账户的别名是否已存在
         List<AccountManagement> accountManagements = this.list(Wrappers.<AccountManagement>lambdaQuery()
@@ -113,7 +121,15 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
      * 账户-管理表删除
      */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void delete(Long id) {
+        //查询流水表的信息
+        List<AccountRunningWater> accountRunningWaterList = accountRunningWaterService.list(Wrappers.<AccountRunningWater>lambdaQuery()
+                .eq(AccountRunningWater::getAccountManagementId, id));
+        //如果存在流水表的数据则不能删除账户表的信息
+        if (accountRunningWaterList.size()>0){
+            throw new ServiceException("无法删除，该账户已存在流水数据");
+        }
         //删除账户-管理表的信息
         this.removeById(id);
         //删除账户-余额表的信息

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

@@ -0,0 +1,18 @@
+<?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
+            adrw.id,
+            adrw.dept_id,
+            adrw.running_water_id,
+            adrw.type,
+            adrw.create_user,
+            adrw.create_time,
+            adrw.update_user,
+            adrw.update_time
+        from account_dept_running_water adrw
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>