添加了请款的数据

hx-account/src/main/java/com/fjhx/account/controller/account/AccountRequestFundsController.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.AccountRequestFundsVo;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.service.account.AccountRequestFundsService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 请款表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+@RestController
+@RequestMapping("/accountRequestFunds")
+public class AccountRequestFundsController {
+
+    @Autowired
+    private AccountRequestFundsService accountRequestFundsService;
+
+    /**
+     * 请款表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountRequestFundsVo> page(@RequestBody AccountRequestFundsSelectDto dto) {
+        return accountRequestFundsService.getPage(dto);
+    }
+
+    /**
+     * 请款表明细
+     */
+    @PostMapping("/detail")
+    public AccountRequestFundsVo detail(@RequestBody BaseSelectDto dto) {
+        return accountRequestFundsService.detail(dto.getId());
+    }
+
+    /**
+     * 请款表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountRequestFundsDto accountRequestFundsDto) {
+        accountRequestFundsService.add(accountRequestFundsDto);
+    }
+
+    /**
+     * 请款表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountRequestFundsDto accountRequestFundsDto) {
+        accountRequestFundsService.edit(accountRequestFundsDto);
+    }
+
+    /**
+     * 请款表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountRequestFundsService.delete(dto.getId());
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/controller/account/AccountRequestFundsDetailController.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.AccountRequestFundsDetailVo;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.service.account.AccountRequestFundsDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+@RestController
+@RequestMapping("/accountRequestFundsDetail")
+public class AccountRequestFundsDetailController {
+
+    @Autowired
+    private AccountRequestFundsDetailService accountRequestFundsDetailService;
+
+    /**
+     * 分页
+     */
+    @PostMapping("/page")
+    public Page<AccountRequestFundsDetailVo> page(@RequestBody AccountRequestFundsDetailSelectDto dto) {
+        return accountRequestFundsDetailService.getPage(dto);
+    }
+
+    /**
+     * 明细
+     */
+    @PostMapping("/detail")
+    public AccountRequestFundsDetailVo detail(@RequestBody BaseSelectDto dto) {
+        return accountRequestFundsDetailService.detail(dto.getId());
+    }
+
+    /**
+     * 新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountRequestFundsDetailDto accountRequestFundsDetailDto) {
+        accountRequestFundsDetailService.add(accountRequestFundsDetailDto);
+    }
+
+    /**
+     * 编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountRequestFundsDetailDto accountRequestFundsDetailDto) {
+        accountRequestFundsDetailService.edit(accountRequestFundsDetailDto);
+    }
+
+    /**
+     * 删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountRequestFundsDetailService.delete(dto.getId());
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.file.entity.ObsFile;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class AccountRequestFundsDetailDto extends AccountRequestFundsDetail {
+
+}

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

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

@@ -0,0 +1,26 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.file.entity.ObsFile;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 请款表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class AccountRequestFundsDto extends AccountRequestFunds {
+
+    //请款详情表的信息
+    private List<AccountRequestFundsDetail> accountRequestFundsDetailList;
+
+    private List<ObsFile> fileList;
+
+}

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

@@ -0,0 +1,25 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 请款表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class AccountRequestFundsSelectDto extends BaseSelectDto {
+    /**
+     * 请款类型（字典funds_type）
+     */
+    private String type;
+
+    /**
+     * 流程状态（10。审批中  20 驳回  30 审批通过）
+     */
+    private String status;
+}

hx-account/src/main/java/com/fjhx/account/entity/account/enums/AccountRequestFundsStatusEnum.java

@@ -0,0 +1,46 @@
+package com.fjhx.account.entity.account.enums;
+
+import org.apache.commons.collections4.MapUtils;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public enum AccountRequestFundsStatusEnum {
+    UNDER_REVIEW("10", "审批中"),
+    REJECT("20", "驳回"),
+    PASS("30","审批通过"),
+    ;
+    private String key;
+
+    private String value;
+
+    private static Map<String, String> map = new LinkedHashMap<>();
+
+    AccountRequestFundsStatusEnum(String key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    /**
+     * 获取枚举map
+     *
+     * @return
+     */
+    public static Map<String, String> getMap() {
+        if (MapUtils.isNotEmpty(map)) {
+            return map;
+        }
+        for (AccountRequestFundsStatusEnum ms : values()) {
+            map.put(ms.key, ms.value);
+        }
+        return map;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

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

@@ -0,0 +1,108 @@
+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-10
+ */
+@Getter
+@Setter
+@TableName("account_request_funds")
+public class AccountRequestFunds extends BasePo {
+
+    /**
+     * 归属部门ID
+     */
+    private Long departmentId;
+
+    /**
+     * 流程ID
+     */
+    private Long processInstanceId;
+
+    /**
+     * 归属公司ID
+     */
+    private Long corporationId;
+
+    /**
+     * 付款账户ID
+     */
+    private Long accountManagementId;
+
+    /**
+     * 用款时间
+     */
+    private Date paymentTime;
+
+    /**
+     * 用款备注
+     */
+    private String paymentRemarks;
+
+    /**
+     * 流程状态
+     */
+    private String status;
+
+    /**
+     * 请款类型（字典funds_type）
+     */
+    private String type;
+
+    /**
+     * 请款总额
+     */
+    private BigDecimal total;
+
+    /**
+     * 单据数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 付款方式（字典funds_payment_method）
+     */
+    private String paymentMethod;
+
+    /**
+     * 户名
+     */
+    private String name;
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+
+    /**
+     * 银行账号
+     */
+    private String accountOpening;
+
+    /**
+     * 联行号
+     */
+    private String interbankNumber;
+
+    /**
+     * 处理意见
+     */
+    private String remarks;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+}

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

@@ -0,0 +1,42 @@
+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-10
+ */
+@Getter
+@Setter
+@TableName("account_request_funds_detail")
+public class AccountRequestFundsDetail extends BasePo {
+    /**
+     * 请款表ID
+     */
+    private Long accountRequestFundsId;
+
+    /**
+     * 费用类型（字典funds_cost_type）
+     */
+    private String costType;
+
+    /**
+     * 请款金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 款项说明
+     */
+    private String remarks;
+
+}

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

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

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

@@ -0,0 +1,42 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.file.entity.ObsFile;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 请款表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class AccountRequestFundsVo extends AccountRequestFunds {
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
+    /**
+     * 归属部门名称
+     */
+    private String deptName;
+
+    /**
+     * 请款人名称
+     */
+    private String userName;
+
+    //请款详情表的信息
+    private List<AccountRequestFundsDetail> accountRequestFundsDetailList;
+
+    /**
+     * 附件信息
+     */
+    private List<ObsFile> fileList;
+}

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

@@ -0,0 +1,87 @@
+package com.fjhx.account.flow;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+import com.fjhx.account.entity.account.enums.AccountRequestFundsStatusEnum;
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.account.service.account.AccountRequestFundsDetailService;
+import com.fjhx.account.service.account.AccountRequestFundsService;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.flow.core.FlowDelegate;
+import com.obs.services.internal.ServiceException;
+import org.springframework.stereotype.Component;
+import oshi.util.FileUtil;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 采购流程
+ * @Author:caozj
+ * @DATE:2023/4/3 17:38
+ */
+@DS(SourceConstant.ACCOUNT)
+@Component
+public class AccountRequestFundsFlow extends FlowDelegate {
+
+    @Override
+    public String getFlowKey() {
+        return "account_request_funds_flow";
+    }
+
+
+    /**
+     * 发起流程
+     * @param flowId 流程ID
+     * @param submitData 请款表信息
+     * @return
+     */
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+        AccountRequestFundsService accountRequestFundsService = SpringUtil.getBean(AccountRequestFundsService.class);
+        AccountRequestFundsDetailService accountRequestFundsDetailService = SpringUtil.getBean(AccountRequestFundsDetailService.class);
+        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject( AccountRequestFundsDto.class);
+        accountRequestFundsDto.setStatus(AccountRequestFundsStatusEnum.UNDER_REVIEW.getKey());
+        accountRequestFundsDto.setProcessInstanceId(flowId);
+        //添加请款表的信息
+        accountRequestFundsService.save(accountRequestFundsDto);
+        //获取请款详情表的详细信息
+        List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDto.getAccountRequestFundsDetailList();
+        if(CollectionUtils.isNotEmpty(accountRequestFundsDetailList)){
+            accountRequestFundsDetailList.forEach(accountRequestFundsDetail -> accountRequestFundsDetail
+                    .setAccountRequestFundsId(accountRequestFundsDto.getId()));
+            //添加请款详情表的信息
+            accountRequestFundsDetailService.saveBatch(accountRequestFundsDetailList);
+        }
+        //添加附件信息
+        ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(),accountRequestFundsDto.getId());
+
+        return accountRequestFundsDto.getId();
+    }
+
+    /**
+     * 结束流程
+     * @param flowId 流程ID
+     * @param businessId 业务ID
+     * @param submitData  请款表信息
+     */
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        AccountRequestFundsService accountRequestFundsService = SpringUtil.getBean(AccountRequestFundsService.class);
+        //通过业务ID查询申购数据
+        AccountRequestFunds accountRequestFunds = accountRequestFundsService.getById(businessId);
+        if(ObjectUtils.isEmpty(accountRequestFunds)){
+            throw new ServiceException("请款表的数据不存在");
+        }
+        //修改申购状态为审批通过
+        accountRequestFunds.setStatus(AccountRequestFundsStatusEnum.PASS.getKey());
+        accountRequestFundsService.updateById(accountRequestFunds);
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.fjhx.account.mapper.account;
+
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+public interface AccountRequestFundsDetailMapper extends BaseMapper<AccountRequestFundsDetail> {
+
+    /**
+     * 分页
+     */
+    Page<AccountRequestFundsDetailVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AccountRequestFundsDetail> wrapper);
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountRequestFundsMapper.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.AccountRequestFunds;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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-10
+ */
+public interface AccountRequestFundsMapper extends BaseMapper<AccountRequestFunds> {
+
+    /**
+     * 请款表分页
+     */
+    Page<AccountRequestFundsVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
+
+}

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

@@ -0,0 +1,46 @@
+package com.fjhx.account.service.account;
+
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailDto;
+
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+public interface AccountRequestFundsDetailService extends BaseService<AccountRequestFundsDetail> {
+
+    /**
+     * 分页
+     */
+    Page<AccountRequestFundsDetailVo> getPage(AccountRequestFundsDetailSelectDto dto);
+
+    /**
+     * 明细
+     */
+    AccountRequestFundsDetailVo detail(Long id);
+
+    /**
+     * 新增
+     */
+    void add(AccountRequestFundsDetailDto accountRequestFundsDetailDto);
+
+    /**
+     * 编辑
+     */
+    void edit(AccountRequestFundsDetailDto accountRequestFundsDetailDto);
+
+    /**
+     * 删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,46 @@
+package com.fjhx.account.service.account;
+
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+
+
+/**
+ * <p>
+ * 请款表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-10
+ */
+public interface AccountRequestFundsService extends BaseService<AccountRequestFunds> {
+
+    /**
+     * 请款表分页
+     */
+    Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto);
+
+    /**
+     * 请款表明细
+     */
+    AccountRequestFundsVo detail(Long id);
+
+    /**
+     * 请款表新增
+     */
+    void add(AccountRequestFundsDto accountRequestFundsDto);
+
+    /**
+     * 请款表编辑
+     */
+    void edit(AccountRequestFundsDto accountRequestFundsDto);
+
+    /**
+     * 请款表删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,57 @@
+package com.fjhx.account.service.account.impl;
+
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.account.mapper.account.AccountRequestFundsDetailMapper;
+import com.fjhx.account.service.account.AccountRequestFundsDetailService;
+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.AccountRequestFundsDetailVo;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailDto;
+import cn.hutool.core.bean.BeanUtil;
+
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@Service
+public class AccountRequestFundsDetailServiceImpl extends ServiceImpl<AccountRequestFundsDetailMapper, AccountRequestFundsDetail> implements AccountRequestFundsDetailService {
+
+    @Override
+    public Page<AccountRequestFundsDetailVo> getPage(AccountRequestFundsDetailSelectDto dto) {
+        IWrapper<AccountRequestFundsDetail> wrapper = getWrapper();
+        wrapper.orderByDesc("arfd", AccountRequestFundsDetail::getId);
+        Page<AccountRequestFundsDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public AccountRequestFundsDetailVo detail(Long id) {
+        AccountRequestFundsDetail AccountRequestFundsDetail = this.getById(id);
+        AccountRequestFundsDetailVo result = BeanUtil.toBean(AccountRequestFundsDetail, AccountRequestFundsDetailVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(AccountRequestFundsDetailDto accountRequestFundsDetailDto) {
+        this.save(accountRequestFundsDetailDto);
+    }
+
+    @Override
+    public void edit(AccountRequestFundsDetailDto accountRequestFundsDetailDto) {
+        this.updateById(accountRequestFundsDetailDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

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

@@ -0,0 +1,150 @@
+package com.fjhx.account.service.account.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+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.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.common.core.domain.entity.SysUser;
+import com.ruoyi.system.service.ISysDeptService;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.utils.UserUtil;
+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.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.AccountRequestFundsVo;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+import cn.hutool.core.bean.BeanUtil;
+
+import javax.swing.plaf.ListUI;
+import java.rmi.ServerException;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 请款表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@Service
+public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFundsMapper, AccountRequestFunds> implements AccountRequestFundsService {
+    @Autowired
+    private CorporationService corporationService;
+
+    @Autowired
+    private ISysDeptService sysDeptService;
+
+    @Autowired
+    private AccountRequestFundsDetailService accountRequestFundsDetailService;
+
+    @Autowired
+    private ISysUserService sysUserService;
+
+    /**
+     * 查询请款列表
+     * @param dto
+     * @return
+     */
+    @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());
+        Page<AccountRequestFundsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //查询公司名称信息
+        List<Corporation> corporationList = corporationService.list();
+        Map<Long, List<Corporation>> corporationMap = corporationList.stream().collect(Collectors.groupingBy(Corporation::getId));
+
+        //查询部门信息
+        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;
+    }
+
+    /**
+     * 查询请款详情
+     * @param id
+     * @return
+     */
+    @Override
+    public AccountRequestFundsVo detail(Long id){
+        AccountRequestFunds accountRequestFunds = this.getById(id);
+        AccountRequestFundsVo accountRequestFundsVo = BeanUtil.toBean(accountRequestFunds, AccountRequestFundsVo.class);
+        //查询归属公司的名称
+        Corporation corporation = corporationService.getById(accountRequestFundsVo.getCorporationId());
+        if (ObjectUtil.isNotEmpty(corporation)){
+            throw new ServiceException("没有找到归属公司信息");
+        }
+        accountRequestFundsVo.setCorporationName(corporation.getName());
+
+        //查询部门名称信息
+        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;
+    }
+
+    @Override
+    public void add(AccountRequestFundsDto accountRequestFundsDto) {
+        this.save(accountRequestFundsDto);
+    }
+
+    @Override
+    public void edit(AccountRequestFundsDto accountRequestFundsDto) {
+        this.updateById(accountRequestFundsDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

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

@@ -0,0 +1,19 @@
+<?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.AccountRequestFundsDetailMapper">
+    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo">
+        select
+            arfd.id,
+            arfd.account_request_funds_id,
+            arfd.cost_type,
+            arfd.amount,
+            arfd.remarks,
+            arfd.create_user,
+            arfd.create_time,
+            arfd.update_user,
+            arfd.update_time
+        from account_request_funds_detail arfd
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,32 @@
+<?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.AccountRequestFundsMapper">
+    <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.processInstance_id,
+            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
+        from account_request_funds arf
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>