Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,75 @@
+package com.fjhx.account.controller.account;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+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.AccountPaymentVo;
+import com.fjhx.account.entity.account.dto.AccountPaymentSelectDto;
+import com.fjhx.account.entity.account.dto.AccountPaymentDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.service.account.AccountPaymentService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 打款表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-11
+ */
+@DS(SourceConstant.ACCOUNT)
+@RestController
+@RequestMapping("/accountPayment")
+public class AccountPaymentController {
+
+    @Autowired
+    private AccountPaymentService accountPaymentService;
+
+    /**
+     * 打款表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountRequestFundsVo> page(@RequestBody AccountRequestFundsSelectDto dto) {
+        return accountPaymentService.getPage(dto);
+    }
+
+    /**
+     * 打款表明细
+     */
+    @PostMapping("/detail")
+    public AccountPaymentVo detail(@RequestBody BaseSelectDto dto) {
+        return accountPaymentService.detail(dto.getId());
+    }
+
+    /**
+     * 打款功能
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountPaymentDto accountPaymentDto) {
+        accountPaymentService.add(accountPaymentDto);
+    }
+
+    /**
+     * 打款表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountPaymentDto accountPaymentDto) {
+        accountPaymentService.edit(accountPaymentDto);
+    }
+
+    /**
+     * 打款表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountPaymentService.delete(dto.getId());
+    }
+
+
+
+}

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

@@ -1,5 +1,7 @@
 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.AccountRequestFundsVo;
@@ -15,9 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 请款表 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
+@DS(SourceConstant.ACCOUNT)
 @RestController
 @RequestMapping("/accountRequestFunds")
 public class AccountRequestFundsController {

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

@@ -18,7 +18,7 @@ public class AccountManagementSelectDto extends BaseSelectDto {
     /**
      * 账户名
      */
-    private String name;
+    private String keyword;
 
     /**
      * 开户银行

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

@@ -0,0 +1,25 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountPayment;
+import com.fjhx.file.entity.ObsFile;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 打款表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AccountPaymentDto extends AccountPayment {
+
+    /**
+     * 附件信息
+     */
+    private List<ObsFile> fileList;
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/dto/AccountPaymentSelectDto.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-11
+ */
+@Getter
+@Setter
+public class AccountPaymentSelectDto extends BaseSelectDto {
+
+}

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

@@ -22,4 +22,16 @@ public class AccountRequestFundsSelectDto extends BaseSelectDto {
      * 流程状态（10。审批中  20 驳回  30 审批通过）
      */
     private String status;
+
+    /**
+     * 打款状态（字典payment_status）
+     */
+    private String paymentStatus;
+
+    /**
+     * 模糊查询时使用
+     */
+    private String keyword;
+
+
 }

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

@@ -27,4 +27,9 @@ public class AccountRunningWaterSelectDto extends BaseSelectDto {
      * 收支类型：10 收入，20支出
      */
     private String status;
+
+    /**
+     * 模糊查询时使用
+     */
+    private String keyword;
 }

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

@@ -0,0 +1,58 @@
+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-11
+ */
+@Getter
+@Setter
+@TableName("account_payment")
+public class AccountPayment extends BasePo {
+
+    /**
+     * 账户表ID
+     */
+    private Long accountManagementId;
+
+    /**
+     * 请款表ID
+     */
+    private Long accountRequestFundsId;
+
+    /**
+     * 打款时间
+     */
+    private Date expensesTime;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 付款金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 打款状态（字典（payment_status）
+     */
+    private String status;
+
+    /**
+     * 摘要
+     */
+    private String remark;
+
+}

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

@@ -25,10 +25,6 @@ public class AccountRequestFunds extends BasePo {
      */
     private Long departmentId;
 
-    /**
-     * 流程ID
-     */
-    private Long processInstanceId;
 
     /**
      * 归属公司ID

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountPayment;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 打款表列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AccountPaymentVo extends AccountPayment {
+
+}

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

@@ -6,6 +6,7 @@ import com.fjhx.file.entity.ObsFile;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -32,6 +33,16 @@ public class AccountRequestFundsVo extends AccountRequestFunds {
      */
     private String userName;
 
+    /**
+     * 打款状态（字典payment_status）
+     */
+    private String accountPaymentStatus;
+
+    /**
+     * 打款金额
+     */
+    private BigDecimal accountPaymentAmount;
+
     //请款详情表的信息
     private List<AccountRequestFundsDetail> accountRequestFundsDetailList;
 
@@ -39,4 +50,6 @@ public class AccountRequestFundsVo extends AccountRequestFunds {
      * 附件信息
      */
     private List<ObsFile> fileList;
+
+
 }

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

@@ -49,7 +49,6 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         AccountRequestFundsDetailService accountRequestFundsDetailService = SpringUtil.getBean(AccountRequestFundsDetailService.class);
         AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject( AccountRequestFundsDto.class);
         accountRequestFundsDto.setStatus(AccountRequestFundsStatusEnum.UNDER_REVIEW.getKey());
-        accountRequestFundsDto.setProcessInstanceId(flowId);
         //添加请款表的信息
         accountRequestFundsService.save(accountRequestFundsDto);
         //获取请款详情表的详细信息

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

@@ -0,0 +1,34 @@
+package com.fjhx.account.mapper.account;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fjhx.account.entity.account.po.AccountPayment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountPaymentVo;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 打款表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-11
+ */
+public interface AccountPaymentMapper extends BaseMapper<AccountPayment> {
+
+    /**
+     * 打款表分页
+     */
+    Page<AccountRequestFundsVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
+
+    /**
+     * 查询打款详情
+     * @param id
+     * @return
+     */
+    AccountPayment detail(Long id);
+}

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

@@ -0,0 +1,48 @@
+package com.fjhx.account.service.account;
+
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.po.AccountPayment;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountPaymentVo;
+import com.fjhx.account.entity.account.dto.AccountPaymentSelectDto;
+import com.fjhx.account.entity.account.dto.AccountPaymentDto;
+
+
+/**
+ * <p>
+ * 打款表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-11
+ */
+public interface AccountPaymentService extends BaseService<AccountPayment> {
+
+    /**
+     * 打款表分页
+     */
+    Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto);
+
+    /**
+     * 打款表明细
+     */
+    AccountPaymentVo detail(Long id);
+
+    /**
+     * 打款功能
+     */
+    void add(AccountPaymentDto accountPaymentDto);
+
+    /**
+     * 打款表编辑
+     */
+    void edit(AccountPaymentDto accountPaymentDto);
+
+    /**
+     * 打款表删除
+     */
+    void delete(Long id);
+
+}

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

@@ -1,5 +1,6 @@
 package com.fjhx.account.service.account.impl;
 
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -9,6 +10,7 @@ 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.obs.services.internal.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,10 +45,10 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
     public Page<AccountManagementVo> getPage(AccountManagementSelectDto dto) {
         LambdaQueryWrapper<AccountManagement> wrapper = Wrappers.<AccountManagement>lambdaQuery();
         //根据关键字查询（查询的字段有账户别名、账户名称、账号）
-        if (StringUtils.isNotEmpty(dto.getName())){
-            wrapper.like(AccountManagement::getName,dto.getName());
-            wrapper.like(AccountManagement::getAlias,dto.getName());
-            wrapper.like(AccountManagement::getAccountOpening,dto.getName());
+        if (StringUtils.isNotEmpty(dto.getKeyword())){
+            wrapper.like(AccountManagement::getName,dto.getKeyword());
+            wrapper.like(AccountManagement::getAlias,dto.getKeyword());
+            wrapper.like(AccountManagement::getAccountOpening,dto.getOpeningBank());
         }
         //根据开户银行查询
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getOpeningBank()),AccountManagement::getOpeningBank,dto.getOpeningBank());
@@ -74,6 +76,12 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
      */
     @Override
     public void add(AccountManagementDto accountManagementDto) {
+        //判断账户的别名是否已存在
+        List<AccountManagement> accountManagements = this.list(Wrappers.<AccountManagement>lambdaQuery()
+                .eq(AccountManagement::getAlias, accountManagementDto.getAlias()));
+        if (accountManagements.size()>0){
+            throw new ServiceException("数据错误：账户别名已存在请重新创建");
+        }
         //添加账户管理表的信息
         this.save(accountManagementDto);
         saveAccountRemainder(accountManagementDto);

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

@@ -0,0 +1,156 @@
+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.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.po.AccountPayment;
+import com.fjhx.account.entity.account.po.AccountRemainder;
+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.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;
+import com.fjhx.file.utils.ObsFileUtil;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.utils.UserUtil;
+import org.checkerframework.checker.units.qual.A;
+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.AccountPaymentVo;
+import com.fjhx.account.entity.account.dto.AccountPaymentSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.account.entity.account.dto.AccountPaymentDto;
+import cn.hutool.core.bean.BeanUtil;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 打款表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-11
+ */
+@Service
+public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper, AccountPayment> implements AccountPaymentService {
+    @Autowired
+    private CorporationService corporationService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private AccountRemainderService accountRemainderService;
+
+    @Override
+    public Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto) {
+        QueryWrapper<Object> wrapper = Wrappers.query();
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()),"arf.type",dto.getType());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()),"arf.status",dto.getStatus());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()),"ap.status",dto.getPaymentStatus());
+        wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()),"arf.payment_remarks",dto.getKeyword());
+        wrapper.orderByDesc("ap.status","arf.payment_time","arf.create_time");
+        Page<AccountRequestFundsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        //切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.COMMON);
+        //查询公司名称信息
+        List<Corporation> corporationList = corporationService.list();
+        Map<Long, List<Corporation>> corporationMap = corporationList.stream().collect(Collectors.groupingBy(Corporation::getId));
+        DynamicDataSourceContextHolder.poll();
+
+
+        //切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+        //查询部门信息
+        List<SysDept> sysDeptList = sysDeptService.list();
+        Map<Long, List<SysDept>> sysDeptMap = sysDeptList.stream().collect(Collectors.groupingBy(SysDept::getDeptId));
+
+
+        //赋值部门名称、归属公司名称
+        List<AccountRequestFundsVo> records = page.getRecords();
+        for (AccountRequestFundsVo record : records) {
+            List<SysDept> sysDepts = sysDeptMap.get(record.getDepartmentId());
+            if (ObjectUtil.isNotEmpty(sysDepts)){
+                record.setDeptName(sysDepts.get(0).getDeptName());
+            }
+            List<Corporation> corporations = corporationMap.get(record.getCorporationId());
+            if (ObjectUtil.isNotEmpty(corporations)){
+                record.setCorporationName(corporations.get(0).getName());
+            }
+
+        }
+
+        // 赋值用户名称
+        UserUtil.assignmentNickName(records, BasePo::getCreateUser,AccountRequestFundsVo::setUserName);
+
+        return page;
+    }
+
+    /**
+     * 打款表明细
+     */
+    @Override
+    public AccountPaymentVo detail(Long id) {
+        AccountPayment AccountPayment = baseMapper.detail(id);
+        AccountPaymentVo result = BeanUtil.toBean(AccountPayment, AccountPaymentVo.class);
+        return result;
+    }
+
+    /**
+     * 打款功能
+     * @param accountPaymentDto
+     */
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public void add(AccountPaymentDto accountPaymentDto) {
+        AccountRemainder accountRemainder = accountRemainderService.getOne(Wrappers.<AccountRemainder>lambdaQuery()
+                .eq(AccountRemainder::getAccountManagementId, accountPaymentDto.getAccountManagementId())
+                .eq(AccountRemainder::getCurrency, accountPaymentDto.getCurrency()));
+        //如果不存在这条数据则返回账户余额不足
+        if (ObjectUtil.isEmpty(accountRemainder)){
+            throw new ServiceException("账户余额不足");
+        }
+        //如果余额小于付款金额则返回账户余额不足
+        if (accountRemainder.getRemainder().compareTo(accountPaymentDto.getAmount()) == -1){
+            throw new ServiceException("账户余额不足");
+        }
+        this.save(accountPaymentDto);
+
+        //添加附件信息
+        ObsFileUtil.saveFile(accountPaymentDto.getFileList(),accountPaymentDto.getId());
+
+        //修改账户-余额表的中余额
+        accountRemainder.setRemainder( accountRemainder.getRemainder().subtract(accountPaymentDto.getAmount()));
+        accountRemainderService.updateById(accountRemainder);
+    }
+
+    @Override
+    public void edit(AccountPaymentDto accountPaymentDto) {
+        this.updateById(accountPaymentDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+
+}

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

@@ -1,6 +1,7 @@
 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.AccountRequestFunds;
@@ -9,6 +10,7 @@ import com.fjhx.account.mapper.account.AccountRequestFundsMapper;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
 import com.fjhx.account.service.account.AccountRequestFundsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.file.utils.ObsFileUtil;
@@ -23,6 +25,7 @@ import org.abego.treelayout.internal.util.java.util.ListUtil;
 import org.apache.catalina.valves.Constants;
 import org.apache.commons.collections4.ListUtils;
 import org.checkerframework.checker.units.qual.A;
+import org.omg.DynamicAny.DynAnyFactoryHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -32,7 +35,9 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import javax.sql.DataSource;
 import javax.swing.plaf.ListUI;
+import javax.xml.crypto.Data;
 import java.rmi.ServerException;
 import java.util.List;
 import java.util.Map;
@@ -71,11 +76,21 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         QueryWrapper<Object> wrapper = Wrappers.query();
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()),"arf.type",dto.getType());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()),"arf.status",dto.getStatus());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()),"ap.status",dto.getPaymentStatus());
+        wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()),"arf.payment_remarks",dto.getKeyword());
+        wrapper.orderByDesc("ap.status","arf.payment_time","arf.create_time");
         Page<AccountRequestFundsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
+        //切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.COMMON);
         //查询公司名称信息
         List<Corporation> corporationList = corporationService.list();
         Map<Long, List<Corporation>> corporationMap = corporationList.stream().collect(Collectors.groupingBy(Corporation::getId));
+        DynamicDataSourceContextHolder.poll();
+
 
+        //切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         //查询部门信息
         List<SysDept> sysDeptList = sysDeptService.list();
         Map<Long, List<SysDept>> sysDeptMap = sysDeptList.stream().collect(Collectors.groupingBy(SysDept::getDeptId));
@@ -110,6 +125,15 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
     public AccountRequestFundsVo detail(Long id){
         AccountRequestFunds accountRequestFunds = this.getById(id);
         AccountRequestFundsVo accountRequestFundsVo = BeanUtil.toBean(accountRequestFunds, AccountRequestFundsVo.class);
+
+        //获取到请款明细信息
+        List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDetailService
+                .list(Wrappers.<AccountRequestFundsDetail>lambdaQuery()
+                        .eq(AccountRequestFundsDetail::getAccountRequestFundsId, accountRequestFunds.getId()));
+        accountRequestFundsVo.setAccountRequestFundsDetailList(accountRequestFundsDetailList);
+
+        //切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.COMMON);
         //查询归属公司的名称
         Corporation corporation = corporationService.getById(accountRequestFundsVo.getCorporationId());
         if (ObjectUtil.isNotEmpty(corporation)){
@@ -117,18 +141,14 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         }
         accountRequestFundsVo.setCorporationName(corporation.getName());
 
+        //切换数据源
+        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         //查询部门名称信息
         SysDept sysDept = sysDeptService.getById(accountRequestFundsVo.getDepartmentId());
         if (ObjectUtil.isNotEmpty(sysDept)){
             throw new ServiceException("没有找到归属部门信息");
         }
         accountRequestFundsVo.setDeptName(sysDept.getDeptName());
-
-        //获取到请款明细信息
-        List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDetailService
-                .list(Wrappers.<AccountRequestFundsDetail>lambdaQuery()
-                .eq(AccountRequestFundsDetail::getAccountRequestFundsId, accountRequestFunds.getId()));
-        accountRequestFundsVo.setAccountRequestFundsDetailList(accountRequestFundsDetailList);
         return accountRequestFundsVo;
     }
 

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

@@ -7,6 +7,7 @@ import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.mapper.account.AccountRunningWaterMapper;
 import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
@@ -30,9 +31,12 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     @Override
     public Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()),"arw.accountManagementId",dto.getAccountManagementId());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getAccountManagementId()),"arw.account_management_id",dto.getAccountManagementId());
         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()));
+        }
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

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

@@ -0,0 +1,49 @@
+<?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.AccountPaymentMapper">
+    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRequestFundsVo">
+        select
+            arf.id,
+            arf.department_id,
+            arf.corporation_id,
+            arf.account_management_id,
+            arf.payment_time,
+            arf.payment_remarks,
+            arf.currency,
+            arf.status,
+            arf.type,
+            arf.total,
+            arf.quantity,
+            arf.payment_method,
+            arf.name,
+            arf.opening_bank,
+            arf.account_opening,
+            arf.interbank_number,
+            arf.remarks,
+            arf.create_user,
+            arf.create_time,
+            arf.update_user,
+            arf.update_time,
+            ap.`status` accountPaymentStatus,
+            ap.amount accountPaymentAmount
+        from account_request_funds arf
+                 left join account_payment ap on arf.id = ap.account_request_funds_id
+            ${ew.customSqlSegment}
+    </select>
+    <select id="detail" resultType="com.fjhx.account.entity.account.po.AccountPayment">
+        select
+            ap.id,
+            ap.account_management_id,
+            ap.expenses_time,
+            ap.currency,
+            ap.amount,
+            ap.status,
+            ap.remark,
+            ap.create_user,
+            ap.create_time,
+            ap.update_user,
+            ap.update_time
+        from account_payment ap
+    </select>
+
+</mapper>

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

@@ -9,7 +9,6 @@
             arf.account_management_id,
             arf.payment_time,
             arf.payment_remarks,
-            arf.processInstance_id,
             arf.currency,
             arf.status,
             arf.type,
@@ -24,8 +23,10 @@
             arf.create_user,
             arf.create_time,
             arf.update_user,
-            arf.update_time
+            arf.update_time,
+            ap.`status` accountPaymentStatus
         from account_request_funds arf
+                 left join account_payment ap on arf.id = ap.account_request_funds_id
             ${ew.customSqlSegment}
     </select>
 

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

@@ -17,7 +17,7 @@
             arw.create_time,
             arw.update_user,
             arw.update_time,
-            am.name accountManagementName
+            am.alias accountManagementName
         from account_running_water arw
                  left join  account_management am on arw.account_management_id = am.id
             ${ew.customSqlSegment}

hx-oa/src/main/java/com/fjhx/oa/controller/netdisk/NetdiskController.java

@@ -7,7 +7,10 @@ import com.fjhx.oa.entity.netdisk.vo.NetdiskVo;
 import com.fjhx.oa.service.netdisk.NetdiskService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -38,9 +41,9 @@ public class NetdiskController {
     /**
      * 网盘子目录树
      */
-    @GetMapping("/tree")
-    public List<NetdiskVo> tree() {
-        return netdiskService.tree();
+    @PostMapping("/tree")
+    public List<NetdiskVo> tree(@RequestBody NetdiskSelectDto dto) {
+        return netdiskService.tree(dto);
     }
 
     /**

hx-oa/src/main/java/com/fjhx/oa/service/netdisk/NetdiskService.java

@@ -25,7 +25,7 @@ public interface NetdiskService extends BaseService<Netdisk> {
      */
     Page<NetdiskVo> getPage(NetdiskSelectDto dto);
 
-    List<NetdiskVo> tree();
+    List<NetdiskVo> tree(NetdiskSelectDto dto);
 
         /**
          * 网盘明细

hx-oa/src/main/java/com/fjhx/oa/service/netdisk/impl/NetdiskServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -61,9 +62,13 @@ public class NetdiskServiceImpl extends ServiceImpl<NetdiskMapper, Netdisk> impl
 
     //网盘目录子目录树
     @Override
-    public List<NetdiskVo> tree() {
-        List<Netdisk> list = list(q -> q.eq(Netdisk::getType, 1));
-
+    public List<NetdiskVo> tree(NetdiskSelectDto dto) {
+        QueryWrapper<Netdisk> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type", 1);
+        if(ObjectUtil.isNotEmpty(dto.getKeyword())) {
+            queryWrapper.like("name", dto.getKeyword());
+        }
+        List<Netdisk> list = list(queryWrapper);
         return treeRecursion(list,-1l);
     }