init

code/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.fjhx</groupId>
+        <artifactId>bytesailing</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>code</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fly</groupId>
+            <artifactId>fly-generator</artifactId>
+            <version>1.0.hx</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.7</version>
+        </dependency>
+    </dependencies>
+
+</project>

code/src/test/java/AccountDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class AccountDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("Fjhx@pwd123")
+                .port(9989)
+                .module("hx-account")
+                .parent("com.fjhx.account")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/BaseDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class BaseDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-area")
+                .parent("com.fjhx.area")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/CommonDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class CommonDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-common")
+                .parent("com.fjhx.common")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/CustomerDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class CustomerDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-customer")
+                .parent("com.fjhx.customer")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/DingDingDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class DingDingDataSource {
+
+//    public static void main(String[] args) {
+//        GeneratorApplication.builder()
+//                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_dingding?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+//                .username("fjhx2012mysql")
+//                .password("3PN-Mzn#vnP&q6d")
+//                .port(9989)
+//                .module("hx-dingding")
+//                .parent("com.fjhx.dingding")
+//                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+//                .build();
+//    }
+
+}

code/src/test/java/IotDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class IotDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9099)
+                .module("hx-iot")
+                .parent("com.fjhx.iot")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/ItemDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class ItemDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-item")
+                .parent("com.fjhx.item")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/JxstDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class JxstDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_jxst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-jxst")
+                .parent("com.fjhx.jxst")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/MailDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class MailDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://121.37.194.75:30102/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("5fWD*oa^nso@kmKa")
+                .port(9989)
+                .module("hx-mail")
+                .parent("com.fjhx.mail")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/MesDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class MesDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-mes")
+                .parent("com.fjhx.mes")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/OaDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class OaDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-oa")
+                .parent("com.fjhx.oa")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/SaleDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class SaleDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("Fjhx@pwd123")
+                .port(9989)
+                .module("hx-sale")
+                .parent("com.fjhx.sale")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/WmsDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class WmsDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("5fWD*oa^nso@kmKa")
+                .port(9989)
+                .module("hx-wms")
+                .parent("com.fjhx.wms")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/ehsdDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class ehsdDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_ehsd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("Fjhx@pwd123")
+                .port(9989)
+                .module("hx-ehsd")
+                .parent("com.fjhx.ehsd")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/purchaseDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class purchaseDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("root")
+                .password("Fjhx@pwd123")
+                .port(9989)
+                .module("hx-purchase")
+                .parent("com.fjhx.purchase")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

code/src/test/java/victoriatouristDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class victoriatouristDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-victoriatourist")
+                .parent("com.fjhx.victoriatourist")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

hx-account/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.fjhx</groupId>
+        <artifactId>bytesailing</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>hx-account</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-item</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,74 @@
+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.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;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 部门-资金流水关联表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@DS(SourceConstant.ACCOUNT)
+@RestController
+@RequestMapping("/accountDeptRunningWater")
+public class AccountDeptRunningWaterController {
+
+    @Autowired
+    private AccountDeptRunningWaterService accountDeptRunningWaterService;
+
+    /**
+     * 部门-资金流水关联表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountRunningWaterVo> page(@RequestBody AccountDeptRunningWaterSelectDto dto) {
+        return accountDeptRunningWaterService.getPage(dto);
+    }
+
+
+
+    /**
+     * 部门-资金流水关联表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountDeptRunningWaterDto accountDeptRunningWaterDto) {
+        accountDeptRunningWaterService.add(accountDeptRunningWaterDto);
+    }
+
+    /**
+     * 部门-资金流水报表
+     * @param dto
+     * @return
+     */
+    @PostMapping("/DeptRunningWaterReport")
+    public  List<Map<String,Object>> DeptRunningWaterReport(@RequestBody AccountDeptRunningWaterSelectDto dto){
+        return accountDeptRunningWaterService.DeptRunningWaterReport(dto);
+    }
+
+    /**
+     * 部门-资金流水统计（ 部门-资金流水列表）
+     * @param dto
+     * @return
+     */
+    @PostMapping("/deptRunningWaterStatistics")
+    public  Map<String,Object> deptRunningWaterStatistics(@RequestBody AccountDeptRunningWaterSelectDto dto){
+        return accountDeptRunningWaterService.deptRunningWaterStatistics(dto);
+    }
+
+
+}

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

@@ -0,0 +1,74 @@
+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;
+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;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 资金流水分拆部门表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@DS(SourceConstant.ACCOUNT)
+@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 AccountRunningWaterVo detail(@RequestBody BaseSelectDto dto) {
+        return accountDeptRunningWaterDetailService.detail(dto.getId());
+    }
+
+    /**
+     * 资金流水分拆部门表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountRunningWaterVo accountRunningWaterVo) {
+        accountDeptRunningWaterDetailService.add(accountRunningWaterVo);
+    }
+
+    /**
+     * 资金流水分拆部门表编辑
+     */
+    @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/controller/account/AccountManagementController.java

@@ -0,0 +1,94 @@
+package com.fjhx.account.controller.account;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.dto.AccountManagementDto;
+import com.fjhx.account.entity.account.dto.AccountManagementSelectDto;
+import com.fjhx.account.entity.account.po.AccountManagement;
+import com.fjhx.account.entity.account.po.AccountRemainder;
+import com.fjhx.account.entity.account.vo.AccountManagementVo;
+import com.fjhx.account.service.account.AccountManagementService;
+import com.fjhx.common.constant.SourceConstant;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 账户-管理表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@DS(SourceConstant.ACCOUNT)
+@RestController
+@RequestMapping("/accountManagement")
+public class AccountManagementController {
+
+    @Autowired
+    private AccountManagementService accountManagementService;
+
+    /**
+     * 账户-管理表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountManagementVo> page(@RequestBody AccountManagementSelectDto dto) {
+        return accountManagementService.getPage(dto);
+    }
+
+    /**
+     * 账户-管理表明细
+     */
+    @PostMapping("/detail")
+    public AccountManagementDto detail(@RequestBody BaseSelectDto dto) {
+        return accountManagementService.detail(dto.getId());
+    }
+
+    /**
+     * 账户-管理表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountManagementDto accountManagementDto) {
+        accountManagementService.add(accountManagementDto);
+    }
+
+    /**
+     * 账户-管理表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountManagementDto accountManagementDto) {
+        accountManagementService.edit(accountManagementDto);
+    }
+
+    /**
+     * 账户-管理表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountManagementService.delete(dto.getId());
+    }
+
+//    /**
+//     * 导入账户表的数据
+//     */
+//    @PostMapping("/importsAmount")
+//    public void importsAmount(@RequestBody AccountManagementDto dto) {
+//        accountManagementService.importsAmount(dto);
+//    }
+
+    /**
+     * 账户统计(账户列表)
+     */
+    @PostMapping("/managementStatistics")
+    public  List<Map<String, Object>> managementStatistics(@RequestBody AccountManagementSelectDto dto) {
+        return accountManagementService.managementStatistics(dto);
+    }
+}

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

@@ -0,0 +1,59 @@
+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<AccountPaymentVo> 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);
+    }
+
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.fjhx.account.controller.account;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 打款记录 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-09-04
+ */
+@RestController
+@RequestMapping("/accountPaymentRecords")
+public class AccountPaymentRecordsController {
+
+
+}

hx-account/src/main/java/com/fjhx/account/controller/account/AccountRemainderController.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.AccountRemainderVo;
+import com.fjhx.account.entity.account.dto.AccountRemainderSelectDto;
+import com.fjhx.account.entity.account.dto.AccountRemainderDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.service.account.AccountRemainderService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 账户-余额表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-06
+ */
+@RestController
+@RequestMapping("/accountRemainder")
+public class AccountRemainderController {
+
+    @Autowired
+    private AccountRemainderService accountRemainderService;
+
+    /**
+     * 账户-余额表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountRemainderVo> page(@RequestBody AccountRemainderSelectDto dto) {
+        return accountRemainderService.getPage(dto);
+    }
+
+    /**
+     * 账户-余额表明细
+     */
+    @PostMapping("/detail")
+    public AccountRemainderVo detail(@RequestBody BaseSelectDto dto) {
+        return accountRemainderService.detail(dto.getId());
+    }
+
+    /**
+     * 账户-余额表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountRemainderDto accountRemainderDto) {
+        accountRemainderService.add(accountRemainderDto);
+    }
+
+    /**
+     * 账户-余额表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountRemainderDto accountRemainderDto) {
+        accountRemainderService.edit(accountRemainderDto);
+    }
+
+    /**
+     * 账户-余额表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountRemainderService.delete(dto.getId());
+    }
+
+}

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

@@ -0,0 +1,84 @@
+package com.fjhx.account.controller.account;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+import com.fjhx.account.service.account.AccountRequestFundsService;
+import com.fjhx.common.constant.SourceConstant;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+
+/**
+ * <p>
+ * 请款表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@DS(SourceConstant.ACCOUNT)
+@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());
+    }
+
+    /**
+     * 获取历史付款信息
+     */
+    @PostMapping("/getPayHistoricalInfo")
+    public List<AccountRequestFundsVo> getPayHistoricalInfo(@RequestBody AccountRequestFundsSelectDto dto) {
+        return accountRequestFundsService.getPayHistoricalInfo(dto);
+    }
+
+}

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/controller/account/AccountRunningWaterController.java

@@ -0,0 +1,135 @@
+package com.fjhx.account.controller.account;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.dto.AccountRunningWaterDto;
+import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
+import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.fjhx.common.constant.SourceConstant;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+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 javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * <p>
+ * 账户资金流水表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@DS(SourceConstant.ACCOUNT)
+@RestController
+@RequestMapping("/accountRunningWater")
+public class AccountRunningWaterController {
+
+    @Autowired
+    private AccountRunningWaterService accountRunningWaterService;
+
+    /**
+     * 账户资金流水表分页
+     */
+    @PostMapping("/page")
+    public Page<AccountRunningWaterVo> page(@RequestBody AccountRunningWaterSelectDto dto) {
+        return accountRunningWaterService.getPage(dto);
+    }
+
+    /**
+     * 账户流水表分页
+     */
+    @PostMapping("/page1")
+    public Page<AccountRunningWaterVo> page1(@RequestBody AccountRunningWaterSelectDto dto) {
+        return accountRunningWaterService.getPage1(dto);
+    }
+
+    /**
+     * 账户资金流水表明细
+     */
+    @PostMapping("/detail")
+    public AccountRunningWaterVo detail(@RequestBody BaseSelectDto dto) {
+        return accountRunningWaterService.detail(dto.getId());
+    }
+
+    /**
+     * 账户资金流水表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountRunningWaterDto accountRunningWaterDto) {
+        accountRunningWaterService.add(accountRunningWaterDto);
+    }
+
+    /**
+     * 账户资金流水表编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountRunningWater accountRunningWaterDto) {
+        accountRunningWaterService.edit(accountRunningWaterDto);
+    }
+
+    /**
+     * 账户资金流水表删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountRunningWaterService.delete(dto.getId());
+    }
+
+    /**
+     * 到账认领统计
+     */
+    @PostMapping("/claimStatistics")
+    public List<AccountRunningWater> claimStatistics(@RequestBody BaseSelectDto dto) {
+        return accountRunningWaterService.claimStatistics(dto);
+    }
+
+    /**
+     * 账户资金流水表导出excel
+     */
+    @PostMapping("/exportExcel")
+    public void exportExcel(@RequestBody AccountRunningWaterSelectDto dto, HttpServletResponse httpServletResponse) {
+        accountRunningWaterService.exportExcel(dto, httpServletResponse);
+    }
+
+    /**
+     * 退税添加
+     */
+    @PostMapping("/taxRefund")
+    public void taxRefund(@RequestBody AccountRunningWaterDto dto) {
+        accountRunningWaterService.taxRefund(dto);
+    }
+
+    /**
+     * 内部转账
+     */
+    @PostMapping("/internalTransfer")
+    public void internalTransfer(@RequestBody AccountRunningWaterDto dto) {
+        accountRunningWaterService.internalTransfer(dto);
+    }
+
+    /**
+     * 流水统计
+     */
+    @PostMapping("/getTotal")
+    public Map<String, List<AccountRunningWaterVo>> internalTransfer(@RequestBody AccountRunningWaterSelectDto dto) {
+        return accountRunningWaterService.getTotal(dto);
+    }
+
+    /**
+     * 汇算（流水金额装人民币金额重新计算）
+     */
+    @PostMapping("/settleAccounts")
+    public void settleAccounts(@RequestBody AccountRunningWater dto) {
+        accountRunningWaterService.settleAccounts(dto);
+    }
+
+}

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

@@ -0,0 +1,51 @@
+package com.fjhx.account.controller.account;
+
+import com.fjhx.account.entity.account.dto.CapitalDailyDto;
+import com.fjhx.account.entity.account.vo.CapitalDailyVo;
+import com.fjhx.account.service.account.StatementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+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;
+import java.util.Map;
+
+/**
+ * 账户-报表
+ */
+@RestController
+@RequestMapping("/accountStatement")
+public class StatementController {
+
+    @Autowired
+    private StatementService statementService;
+
+    /**
+     * 资金日报表
+     */
+    @PostMapping("/capitalDaily")
+    public List<CapitalDailyVo> getCapitalDaily(@Validated @RequestBody CapitalDailyDto dto) {
+        return statementService.getCapitalDaily(dto);
+    }
+
+    /**
+     *
+     */
+    @PostMapping("/getCurrencyList")
+    public List<CapitalDailyVo.Currency> getCurrencyList(@Validated @RequestBody CapitalDailyDto dto) {
+        return statementService.getCurrencyList(dto);
+    }
+
+    /**
+     *
+     */
+    @PostMapping("/getTotalList")
+    public List<Map<String, Object>> getTotalList(@Validated @RequestBody CapitalDailyDto dto) {
+        return statementService.getTotalList(dto);
+    }
+
+
+}

hx-account/src/main/java/com/fjhx/account/controller/tax/TaxRefundDetailsController.java

@@ -0,0 +1,37 @@
+package com.fjhx.account.controller.tax;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.tax.dto.TaxRefundDetailsSelectDto;
+import com.fjhx.account.entity.tax.vo.TaxRefundDetailsVo;
+import com.fjhx.account.service.tax.TaxRefundDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+
+/**
+ * <p>
+ * 退税明细表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@RestController
+@RequestMapping("/taxRefundDetails")
+public class TaxRefundDetailsController {
+
+    @Autowired
+    private TaxRefundDetailsService taxRefundDetailsService;
+
+    /**
+     * 退税明细表分页
+     */
+    @PostMapping("/page")
+    public Page<TaxRefundDetailsVo> page(@RequestBody TaxRefundDetailsSelectDto dto) {
+        return taxRefundDetailsService.getPage(dto);
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/controller/transaction/TransactionController.java

@@ -0,0 +1,46 @@
+package com.fjhx.account.controller.transaction;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.transaction.dto.TransactionDto;
+import com.fjhx.account.entity.transaction.dto.TransactionSelectDto;
+import com.fjhx.account.entity.transaction.vo.TransactionVo;
+import com.fjhx.account.service.transaction.TransactionService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+
+/**
+ * <p>
+ * 往来管理 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@RestController
+@RequestMapping("/transaction")
+public class TransactionController {
+
+    @Autowired
+    private TransactionService transactionService;
+
+    /**
+     * 往来管理分页
+     */
+    @PostMapping("/page")
+    public Page<TransactionVo> page(@RequestBody TransactionSelectDto dto) {
+        return transactionService.getPage(dto);
+    }
+
+    /**
+     * 往来管理新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody TransactionDto transactionDto) {
+        transactionService.add(transactionDto);
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/controller/transaction/TransactionDepartmentController.java

@@ -0,0 +1,70 @@
+package com.fjhx.account.controller.transaction;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.transaction.dto.TransactionDepartmentDto;
+import com.fjhx.account.entity.transaction.dto.TransactionDepartmentSelectDto;
+import com.fjhx.account.entity.transaction.po.TransactionDepartment;
+import com.fjhx.account.entity.transaction.vo.TransactionDepartmentVo;
+import com.fjhx.account.service.transaction.TransactionDepartmentService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 往来单位 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@RestController
+@RequestMapping("/transactionDepartment")
+public class TransactionDepartmentController {
+
+    @Autowired
+    private TransactionDepartmentService transactionDepartmentService;
+
+    /**
+     * 往来单位列表
+     */
+    @GetMapping("/list")
+    public List<TransactionDepartment> list() {
+        return transactionDepartmentService.getList();
+    }
+
+    /**
+     * 往来单位分页
+     */
+    @PostMapping("/page")
+    public Page<TransactionDepartmentVo> page(@RequestBody TransactionDepartmentSelectDto dto) {
+        return transactionDepartmentService.getPage(dto);
+    }
+
+    /**
+     * 往来单位新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody TransactionDepartmentDto transactionDepartmentDto) {
+        transactionDepartmentService.add(transactionDepartmentDto);
+    }
+
+    /**
+     * 往来单位编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody TransactionDepartmentDto transactionDepartmentDto) {
+        transactionDepartmentService.edit(transactionDepartmentDto);
+    }
+
+    /**
+     * 往来单位删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        transactionDepartmentService.delete(dto.getId());
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/controller/utils/DateUtils.java

@@ -0,0 +1,44 @@
+package com.fjhx.account.controller.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+public class DateUtils {
+    /**
+     * 获取两个日期之间的所有月份 (年月)
+     *
+     * @param
+     * @param
+     * @return：YYYY-MM
+     */
+    public static List<String> getMonthBetweenDate(Date startDate, Date endDate) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        // 声明保存日期集合
+        List<String> list = new ArrayList<String>();
+        try {
+//            // 转化成日期类型
+//            Date startDate = sdf.parse(startTime);
+//            Date endDate = sdf.parse(endTime);
+
+            //用Calendar 进行日期比较判断
+            Calendar calendar = Calendar.getInstance();
+            while (startDate.getTime() <= endDate.getTime()) {
+                // 把日期添加到集合
+                list.add(sdf.format(startDate));
+                // 设置日期
+                calendar.setTime(startDate);
+                //把日期增加一天
+                calendar.add(Calendar.MONTH, 1);
+                // 获取增加后的日期
+                startDate = calendar.getTime();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+}

hx-account/src/main/java/com/fjhx/account/controller/write/WriteOffRecordsController.java

@@ -0,0 +1,46 @@
+package com.fjhx.account.controller.write;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.write.dto.WriteOffRecordsDto;
+import com.fjhx.account.entity.write.dto.WriteOffRecordsSelectDto;
+import com.fjhx.account.entity.write.vo.WriteOffRecordsVo;
+import com.fjhx.account.service.write.WriteOffRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+
+/**
+ * <p>
+ * 冲销记录表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-12
+ */
+@RestController
+@RequestMapping("/writeOffRecords")
+public class WriteOffRecordsController {
+
+    @Autowired
+    private WriteOffRecordsService writeOffRecordsService;
+
+    /**
+     * 冲销记录表分页
+     */
+    @PostMapping("/page")
+    public Page<WriteOffRecordsVo> page(@RequestBody WriteOffRecordsSelectDto dto) {
+        return writeOffRecordsService.getPage(dto);
+    }
+
+    /**
+     * 冲销记录表新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody WriteOffRecordsDto writeOffRecordsDto) {
+        writeOffRecordsService.add(writeOffRecordsDto);
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/bo/AccountRunningWaterBo.java

@@ -0,0 +1,74 @@
+package com.fjhx.account.entity.account.bo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Getter
+@Setter
+public class AccountRunningWaterBo {
+
+    /**
+     * 资金账户名称
+     */
+    @ExcelProperty("资金账户")
+    private String accountManagementName;
+    /**
+     * 交易时间
+     */
+    @ExcelProperty("交易时间")
+    private Date transactionTime;
+
+    /**
+     * 收支类型：10 收入，20支出
+     */
+    @ExcelProperty("收支类型")
+    private String status;
+
+    /**
+     * 合同到账（10:是，20:否）
+     */
+    @ExcelProperty("是否合同到账")
+    private String received;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    @ExcelProperty("币种")
+    private String currency;
+
+    /**
+     * 金额
+     */
+    @ExcelProperty("交易金额")
+    private BigDecimal amount;
+
+    /**
+     * 账户名
+     */
+    @ExcelProperty("对方账户")
+    private String name;
+
+    /**
+     * 开户银行
+     */
+    @ExcelProperty("对方银行")
+    private String openingBank;
+
+    /**
+     * 开户账号
+     */
+    @ExcelProperty("对方账号")
+    private String accountOpening;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty("摘要")
+    private String remarks;
+
+
+}

hx-account/src/main/java/com/fjhx/account/entity/account/bo/CapitalDailyBo.java

@@ -0,0 +1,49 @@
+package com.fjhx.account.entity.account.bo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+public class CapitalDailyBo {
+
+    /**
+     * 归属公司id
+     */
+    private Long corporationId;
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
+    /**
+     * 账户id
+     */
+    private Long accountManagementId;
+
+    /**
+     * 账户名称
+     */
+    private String accountManagementAlias;
+
+    /**
+     * 货币类型（币种）
+     */
+    private String currencyType;
+
+    /**
+     * 余额
+     */
+    private BigDecimal remainder;
+
+    /**
+     * 记录
+     */
+    private List<Map<String, Object>> flowingWaterList;
+
+}

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,69 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 部门-资金流水关联表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-13
+ */
+@Getter
+@Setter
+public class AccountDeptRunningWaterSelectDto extends BaseSelectDto {
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 收支类型：10 收入，20支出
+     */
+    private String status;
+
+    /**
+     * 模糊查询时使用
+     */
+    private String keyword;
+
+    /**
+     *是否分拆（10未分拆  20 已分拆）
+     */
+    private String type;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 归属公司id
+     */
+    private Long corporationId;
+
+    /**
+     * 账户-管理表ID
+     */
+    private Long accountManagementId;
+
+    /**
+     *摘要
+     */
+    private String remarks;
+
+    /**
+     * 起始金额
+     */
+    private BigDecimal beginAmount;
+
+    /**
+     * 结束金额
+     */
+    private BigDecimal endAmount;
+
+
+}

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

@@ -0,0 +1,29 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fjhx.account.entity.account.po.AccountManagement;
+import com.fjhx.account.entity.account.po.AccountRemainder;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 账户-管理表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountManagementDto extends AccountManagement {
+    @TableField(exist = false)
+    private List<AccountRemainder> accountRemainderList;
+
+    private String tenantId;
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+}

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

@@ -0,0 +1,27 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 账户-管理表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountManagementSelectDto extends BaseSelectDto {
+
+
+    /**
+     * 账户名
+     */
+    private String keyword;
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+}

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

@@ -0,0 +1,45 @@
+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;
+
+    /**
+     * 账户名
+     */
+    private String name;
+
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountOpening;
+
+
+
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountPaymentRecords;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 打款记录新增编辑入参实体
+ *
+ * @author
+ * @since 2023-09-04
+ */
+@Getter
+@Setter
+public class AccountPaymentRecordsDto extends AccountPaymentRecords {
+
+}

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

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/AccountRemainderDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountRemainder;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 账户-余额表新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountRemainderDto extends AccountRemainder {
+
+}

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

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,138 @@
+package com.fjhx.account.entity.account.dto;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.exception.ServiceException;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 请款表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class AccountRequestFundsSelectDto extends BaseSelectDto {
+    /**
+     * 请款类型（字典funds_type）
+     */
+    private String type;
+
+    /**
+     * 流程状态（10。审批中  20 驳回  30 审批通过）
+     */
+    private String status;
+
+    /**
+     * 打款状态（字典payment_status）
+     */
+    private String paymentStatus;
+
+    /**
+     * 模糊查询时使用
+     */
+    private String keyword;
+
+    /**
+     * 归属部门ID
+     */
+    private Long departmentId;
+
+    /**
+     * 归属公司ID
+     */
+    private Long corporationId;
+
+    /**
+     * 申请人ID
+     */
+    private Long createUser;
+
+    /**
+     * 币种
+     */
+    private String currency;
+
+    /**
+     * 交易开始金额
+     */
+    private BigDecimal startAmount;
+
+    /**
+     * 交易结束金额
+     */
+    private BigDecimal endAmount;
+
+    /**
+     * 款项说明
+     */
+    private String paymentRemark;
+
+    /**
+     * 核销状态
+     */
+    private Integer writeOffStatus;
+
+    /**
+     * 最小请款金额
+     */
+    private BigDecimal minAdvanceAmounts;
+
+    /**
+     * 最大请款金额
+     */
+    private BigDecimal maxAdvanceAmounts;
+
+    /**
+     * 用款说明
+     */
+    private String paymentRemarks;
+
+    /**
+     * 付款方式
+     */
+    private String paymentMethod;
+
+    private String beginCreateTime;
+    private String endCreateTime;
+
+    public Date getBeginCreateTime() {
+        if (ObjectUtil.isEmpty(beginCreateTime)) {
+            return null;
+        }
+
+        try {
+            return DateUtil.beginOfDay(DateUtil.parse(beginCreateTime));
+        } catch (Exception e) {
+            throw new ServiceException("开始时间格式错误");
+        }
+
+    }
+
+    public Date getEndCreateTime() {
+
+        if (ObjectUtil.isEmpty(endCreateTime)) {
+            return null;
+        }
+
+        try {
+            return DateUtil.endOfDay(DateUtil.parse(endCreateTime));
+        } catch (Exception e) {
+            throw new ServiceException("结束时间格式错误");
+        }
+
+    }
+
+
+    /**
+     * 对方账户过滤
+     */
+    private String oppositeAccountName;
+
+}

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

@@ -0,0 +1,51 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.entity.tax.po.TaxRefundDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 账户资金流水表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountRunningWaterDto extends AccountRunningWater {
+
+    /**
+     * 退税合同明细列表
+     */
+    List<TaxRefundDetails> taxRefundDetailsList;
+
+    /**
+     * 转入账户-管理表ID
+     */
+    private Long inAccountManagementId;
+    /**
+     * 转入金额
+     */
+    private BigDecimal inAmount;
+
+    /**
+     * 转入币种（字典account_currency）
+     */
+    private String inCurrency;
+
+    /**
+     * 手续费金额
+     */
+    private BigDecimal commissionAmount;
+
+    /**
+     * 手续费币种（字典account_currency）
+     */
+    private String commissionCurrency;
+
+}

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

@@ -0,0 +1,92 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 账户资金流水表列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountRunningWaterSelectDto extends BaseSelectDto {
+    /**
+     * 账户-管理表ID
+     */
+    private Long accountManagementId;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 收支类型：10 收入，20支出
+     */
+    private String status;
+
+    /**
+     * 模糊查询时使用
+     */
+    private String keyword;
+
+    /**
+     * 数据类型 1:到账认领
+     */
+    private Integer dataType;
+
+    /**
+     * 是否认领
+     */
+    private String isClaim;
+
+    /**
+     * 是否合同到账
+     */
+    private String received;
+
+    /**
+     * 交易开始金额
+     */
+    private BigDecimal beginAmount;
+
+    /**
+     * 交易结束金额
+     */
+    private BigDecimal endAmount;
+
+    /**
+     * 对方账户名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 交易开始时间
+     */
+    private String startTime;
+    /**
+     * 交易结束时间
+     */
+    private String stopTime;
+
+    /**
+     * 流水ID
+     */
+    private List<Long> accountWaterIdList;
+
+    /**
+     * 是否汇算
+     */
+    private Integer isSettleAccounts;
+}

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

@@ -0,0 +1,30 @@
+package com.fjhx.account.entity.account.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+public class CapitalDailyDto {
+
+    /**
+     * 期间
+     */
+    @NotBlank(message = "范围期间不能为空")
+    private String dateBetween;
+
+    /**
+     * 资金账号id
+     * account模块 account_management表 id
+     */
+    private Long managementId;
+
+    /**
+     * 归属公司id
+     * common模块 corporation表 id
+     */
+    private Long corporationId;
+
+}

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

@@ -0,0 +1,168 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.fjhx.account.entity.account.dto;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 资金账户管理表实体类
+ *
+ * @author BladeX
+ * @since 2022-07-05
+ */
+@Data
+@TableName("t_erp_fund_account")
+
+public class FundAccount{
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+    /**
+     * 公司ID
+     */
+    private String companyId;
+
+    /**
+     * 账号名
+     */
+    private String name;
+
+    /**
+     * 账号
+     */
+    private String accountNumber;
+
+    /**
+     * 人民币余额
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal rmbAmount;
+
+    /**
+     * 美元余额
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal dollarAmount;
+
+    /**
+     * 欧元余额
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal euroAmount;
+
+    /**
+     * 英镑余额
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal sterlingAmount;
+
+    /**
+     * 美元汇率
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal dollarExchange;
+
+    /**
+     * 欧元汇率
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal euroExchange;
+
+    /**
+     * 英镑汇率
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal sterlingExchange;
+
+    /**
+     * 备注
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String remark;
+
+    /**
+     * 是否删除。 0:否。  1 是
+     */
+    private Integer delFleg;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+    /**
+     * 人民币初始化
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal rmb;
+
+    /**
+     * 欧元初始化
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal euro;
+
+    /**
+     * 美元初始化
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal dollar;
+
+    /**
+     * 英镑初始化
+     */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private BigDecimal sterling;
+
+    /**
+     * 公司名称
+     */
+    @TableField(exist = false)
+    private String companyName;
+
+
+    /**
+     * 公司ID
+     */
+    private String createUser;
+
+    /**
+     * 账号名
+     */
+    private Date createTime;
+
+    /**
+     * 账号
+     */
+    private String updateUser;
+
+    /**
+     * 账号
+     */
+    private Date updateTime;
+
+
+
+}

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

@@ -0,0 +1,47 @@
+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/enums/PaymentStatusEnum.java

@@ -0,0 +1,47 @@
+package com.fjhx.account.entity.account.enums;
+
+import org.apache.commons.collections4.MapUtils;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+//打款状态
+public enum PaymentStatusEnum {
+    UNDER_REVIEW("20", "未打款"),
+    PARTIAL("15", "部分打款"),
+    REJECT("10", "已打款"),
+    ;
+    private String key;
+
+    private String value;
+
+    private static Map<String, String> map = new LinkedHashMap<>();
+
+    PaymentStatusEnum(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 (PaymentStatusEnum 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/enums/PaymentTypeEnum.java

@@ -0,0 +1,47 @@
+package com.fjhx.account.entity.account.enums;
+
+import org.apache.commons.collections4.MapUtils;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+//打款类型
+public enum PaymentTypeEnum {
+    UNDER_REVIEW("10", "请款"),
+    REJECT("20", "采购付款"),
+    RECEIVE("30", "退货到款登记"),
+    ;
+    private String key;
+
+    private String value;
+
+    private static Map<String, String> map = new LinkedHashMap<>();
+
+    PaymentTypeEnum(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 (PaymentTypeEnum 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/AccountDeptRunningWater.java

@@ -0,0 +1,34 @@
+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 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/po/AccountManagement.java

@@ -0,0 +1,106 @@
+package com.fjhx.account.entity.account.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 账户-管理表
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+@TableName("account_management")
+public class AccountManagement extends BasePo {
+
+    /**
+     * 归属公司id（common模块corporation表id）
+     */
+    private Long corporationId;
+
+    /**
+     * 账户别名
+     */
+    private String alias;
+
+    /**
+     * 账户名
+     */
+    private String name;
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountOpening;
+
+    /**
+     * 联行号
+     */
+    private String interbankNumber;
+
+
+
+    /**
+     * 账户名称（外汇信息）
+     */
+    private String beneficiaryName;
+
+    /**
+     * 开户银行（外汇信息）
+     */
+    private String beneficiaryBank;
+
+    /**
+     * 开户银行地址（外汇信息）
+     */
+    private String beneficiaryBankAddress;
+
+    /**
+     * 账号（外汇信息）
+     */
+    private String beneficiaryAccountNumber;
+
+    /**
+     * 银行代码（外汇信息）
+     */
+    private String swiftCode;
+
+    /**
+     * 收款人地址（外汇信息）
+     */
+    private String beneficiaryAddress;
+
+
+
+
+
+//    /**
+//     * 云帆ID
+//     */
+//    private String yfId;
+//
+//    /**
+//     * 云帆——归属公司id（common模块corporation表id）
+//     */
+//    private String yfCorporationId;
+//
+//    private String yfCreateUser;
+//
+//    private String yfUpdateUser;
+//
+//    private String tenantId;
+
+
+
+
+}

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

@@ -0,0 +1,129 @@
+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 businessId;
+
+    /**
+     * 归属部门ID
+     */
+    private Long departmentId;
+
+    /**
+     * 归属公司ID
+     */
+    private Long corporationId;
+
+    /**
+     * 打款时间
+     */
+    private Date expensesTime;
+
+    /**
+     * 用款时间
+     */
+    private Date paymentTime;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 付款金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 打款状态(10已打款 20 未打款)
+     */
+    private String status;
+
+    /**
+     * 付款类型（10：请款  20 采购付款） 字典payment_type
+     */
+    private String type;
+
+    /**
+     * 摘要
+     */
+    private String remark;
+
+    /**
+     * 款项说明
+     */
+    private String paymentRemark;
+
+
+    /**
+     * 付款方式（字典funds_payment_method（多余的业务字段）
+     */
+    private String paymentMethod;
+
+    /**
+     * 户名（业务中的收款户名）（多余的业务字段）
+     */
+    private String name;
+
+    /**
+     * 开户银行（业务中的收款开户银行）（多余的业务字段）
+     */
+    private String openingBank;
+
+    /**
+     * 银行账号（业务中的收款银行账号）（多余的业务字段）
+     */
+    private String accountOpening;
+
+    /**
+     * 联行号（业务中的收款联行号）（多余的业务字段）
+     */
+    private String interbankNumber;
+
+    /**
+     * 业务中选中的付款账户表ID（多余字段）
+     */
+    private Long businessManagementId;
+
+    /**
+     * 币种（字典account_currency）（业务中的付款币种）（多余的业务字段）
+     */
+    private String businessCurrency;
+
+
+    /**
+     * 业务金额（业务中需要收款的金额）（多余字段）
+     */
+    private BigDecimal incomeAmount;
+
+    /**
+     * 数据所属人
+     */
+    private Long dataUser;
+}

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

@@ -0,0 +1,54 @@
+package com.fjhx.account.entity.account.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 打款记录
+ * </p>
+ *
+ * @author
+ * @since 2023-09-04
+ */
+@Getter
+@Setter
+@TableName("account_payment_records")
+public class AccountPaymentRecords extends BasePo {
+
+    /**
+     * 打款id
+     */
+    private Long accountPaymentId;
+
+    /**
+     * 打款账户id
+     */
+    private Long accountManagementId;
+    /**
+     * 币种
+     */
+    private String currency;
+    /**
+     * 打款金额
+     */
+    private BigDecimal amount;
+    /**
+     * 打款时间
+     */
+    private Date expensesTime;
+    /**
+     * 是否往来
+     */
+    private Integer isTransaction;
+    /**
+     * 摘要
+     */
+    private String remark;
+
+}

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

@@ -0,0 +1,52 @@
+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-06
+ */
+@Getter
+@Setter
+@TableName("account_remainder")
+public class AccountRemainder extends BasePo {
+
+    /**
+     * 账户管理表ID
+     */
+    private Long accountManagementId;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 余额
+     */
+    private BigDecimal remainder;
+
+    /**
+     * 变更-余额
+     */
+    private BigDecimal changeRemainder;
+
+    /**
+     * 交易状态：10 收入，20支出
+     */
+    private String status ;
+
+    /**
+     * 交易状态：10 收入，20支出
+     */
+    private String tenantId;
+}

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

@@ -0,0 +1,125 @@
+package com.fjhx.account.entity.account.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <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 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;
+
+    /**
+     * 汇率
+     */
+    private BigDecimal rate;
+
+    /**
+     * 核销状态
+     */
+    private Integer writeOffStatus;
+
+    /**
+     * 预支总金额
+     */
+    private BigDecimal advanceAmounts;
+
+    /**
+     * 预支id
+     */
+    private Long advanceId;
+
+}

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

@@ -0,0 +1,64 @@
+package com.fjhx.account.entity.account.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <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;
+
+    /**
+     * 合同ID
+     */
+    private Long contractId;
+
+    /**
+     * 合同编码
+     */
+    @TableField(exist = false)
+    private String contractCode;
+
+    /**
+     * 预支金额
+     */
+    private BigDecimal advanceAmount;
+
+    /**
+     * 数据来源类型 1合同 2ehsd样品单
+     */
+    private Integer dataType;
+
+}

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

@@ -0,0 +1,118 @@
+package com.fjhx.account.entity.account.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 账户资金流水表
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+@TableName("account_running_water")
+public class AccountRunningWater extends BasePo {
+
+    /**
+     * 账户-管理表ID
+     */
+    private Long accountManagementId;
+
+    /**
+     * 业务ID
+     */
+    private Long businessId;
+
+    /**
+     * 流水类型。10：打款
+     */
+    private String type;
+
+    /**
+     * 收支类型：10 收入，20支出
+     */
+    private String status;
+
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 已认领总金额
+     */
+    private BigDecimal claimAmount;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    @NotBlank(message = "币种不能为null")
+    private String currency;
+
+    /**
+     * 账户名
+     */
+    private String name;
+
+    /**
+     * 合同到账（10:是，20:否）
+     */
+    private String received;
+
+    /**
+     * 开户银行
+     */
+    private String openingBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountOpening;
+
+    /**
+     * 交易时间
+     */
+    private Date transactionTime;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 是否认领
+     */
+    private Integer isClaim;
+
+    /**
+     * 汇率
+     */
+    private BigDecimal rate;
+
+    /**
+     * 条数
+     */
+    @TableField(exist = false)
+    private Integer count;
+
+    /**
+     * 打款记录id
+     */
+    private Long accountPaymentRecordsId;
+
+    /**
+     * 转人民币金额
+     */
+    private BigDecimal amountCny;
+
+}

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/entity/account/vo/AccountManagementVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountManagement;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 账户-管理表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountManagementVo extends AccountManagement {
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
+}

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

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

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

@@ -0,0 +1,49 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountPayment;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 打款表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AccountPaymentVo extends AccountPayment {
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     *归属公司名称
+     */
+    private String corporationName;
+
+    /**
+     * 用户名称
+     */
+    private  String userName;
+
+
+    /**
+     * 实际打款的付款账户名称
+     */
+    private String accountManagementName;
+
+    /**
+     * 业务中选中的付款账户名称
+     */
+    private String businessManagementName;
+
+    /**
+     * 打开记录列表
+     */
+    private List<AccountPaymentRecordsVo> accountPaymentRecordsList;
+}

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

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

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

@@ -0,0 +1,33 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-10
+ */
+@Getter
+@Setter
+public class AccountRequestFundsDetailVo extends AccountRequestFundsDetail {
+
+    /**
+     * 币种
+     */
+    private String currency;
+
+    /**
+     * 合同编号
+     */
+    private String contractCode;
+
+    /**
+     * 汇率
+     */
+    private BigDecimal rate;
+}

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

@@ -0,0 +1,69 @@
+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.math.BigDecimal;
+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;
+
+    /**
+     * 打款状态（字典payment_status）
+     */
+    private String accountPaymentStatus;
+
+    /**
+     * 付款账户名称
+     */
+    private String accountManagementName;
+
+    /**
+     * 打款金额
+     */
+    private BigDecimal accountPaymentAmount;
+
+    //请款详情表的信息
+    private List<AccountRequestFundsDetailVo> accountRequestFundsDetailList;
+
+    /**
+     * 附件信息
+     */
+    private List<ObsFile> fileList;
+
+    /**
+     * 流程ID
+     */
+    private Long flowInfoId;
+
+    /**
+     * 打款id
+     */
+    private Long accountPaymentId;
+
+}

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

@@ -0,0 +1,105 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 账户资金流水表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-04-06
+ */
+@Getter
+@Setter
+public class AccountRunningWaterVo extends AccountRunningWater {
+    /**
+     * 资金账户名称
+     */
+    private String accountManagementName;
+
+    /**
+     * 是否分拆(10 未分拆，20 已分拆 )
+     */
+    private String type;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 资金流水-部门表ID
+     */
+    private Long accountDeptRunningWaterId;
+
+    /**
+     *资金流水-部门关联表列表
+     */
+    private List<AccountDeptRunningWaterDetail> deptRunningWaterDetailList;
+
+    /**
+     * 收入金额
+     */
+    private BigDecimal incomeAmount;
+
+    /**
+     * 支出金额
+     */
+    private BigDecimal expenditureAmount;
+
+
+    /**
+     * 结余金额
+     */
+    private BigDecimal balanceAmount;
+
+    /**
+     * 日期
+     */
+    private String time;
+
+    /**
+     * 收支类型
+     */
+    private String status;
+
+    /**
+     * 归属公司id
+     */
+    private Long corporationId;
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
+    /**
+     * 账户余额
+     */
+    private BigDecimal remainder;
+
+    /**
+     * 资金账户账户
+     */
+    private String accountManagementOpening;
+
+    /**
+     * 订单编码集合
+     */
+    private String contractCodes;
+
+    /**
+     * 销售合同id集合
+     */
+    private String contractIds;
+}

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

@@ -0,0 +1,66 @@
+package com.fjhx.account.entity.account.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+public class CapitalDailyVo {
+
+    /**
+     * 归属公司id
+     */
+    private Long corporationId;
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+
+    /**
+     * 账户信息
+     */
+    private List<Management> managementList;
+
+
+    @Getter
+    @Setter
+    public static class Management {
+
+        /**
+         * 账户id
+         */
+        private Long accountManagementId;
+
+        /**
+         * 账户名称
+         */
+        private String accountManagementAlias;
+
+        /**
+         * 货币
+         */
+        private List<Currency> currencyList;
+
+    }
+
+    @Getter
+    @Setter
+    public static class Currency {
+
+        /**
+         * 货币类型（币种）
+         */
+        private String currencyType;
+
+        /**
+         * 记录
+         */
+        private List<Map<String, Object>> flowingWaterList;
+
+    }
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.tax.dto;
+
+import com.fjhx.account.entity.tax.po.TaxRefundDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 退税明细表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class TaxRefundDetailsDto extends TaxRefundDetails {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.tax.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 退税明细表列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class TaxRefundDetailsSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,50 @@
+package com.fjhx.account.entity.tax.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 退税明细表
+ * </p>
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+@TableName("tax_refund_details")
+public class TaxRefundDetails extends BasePo {
+
+    /**
+     * 资金流水id
+     */
+    private Long accountRunningWaterId;
+
+    /**
+     * 合同id
+     */
+    private Long contractId;
+
+    /**
+     * 合同退税关联金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 汇率
+     */
+    @TableField(exist = false)
+    private BigDecimal rate;
+
+    /**
+     * 币种
+     */
+    @TableField(exist = false)
+    private String currency;
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.tax.vo;
+
+import com.fjhx.account.entity.tax.po.TaxRefundDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 退税明细表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-30
+ */
+@Getter
+@Setter
+public class TaxRefundDetailsVo extends TaxRefundDetails {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.transaction.dto;
+
+import com.fjhx.account.entity.transaction.po.TransactionDepartment;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 往来单位新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@Getter
+@Setter
+public class TransactionDepartmentDto extends TransactionDepartment {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.transaction.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 往来单位列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@Getter
+@Setter
+public class TransactionDepartmentSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.transaction.dto;
+
+import com.fjhx.account.entity.transaction.po.Transaction;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 往来管理新增编辑入参实体
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@Getter
+@Setter
+public class TransactionDto extends Transaction {
+
+}

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

@@ -0,0 +1,31 @@
+package com.fjhx.account.entity.transaction.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 往来管理列表查询入参实体
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@Getter
+@Setter
+public class TransactionSelectDto extends BaseSelectDto {
+
+    /**
+     * 是否流水 1是 0否
+     */
+    private String isFlowingWater;
+    /**
+     * 往来单位
+     */
+    private Long departmentId;
+
+    /**
+     * 往来类型 0收入 1支出
+     */
+    private Integer type;
+
+}

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

@@ -0,0 +1,56 @@
+package com.fjhx.account.entity.transaction.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 往来管理
+ * </p>
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@Getter
+@Setter
+@TableName("transaction")
+public class Transaction extends BasePo {
+
+    /**
+     * 往来单位
+     */
+    private Long departmentId;
+
+    /**
+     * 往来类型 0收入 1支出
+     */
+    private Integer type;
+
+    /**
+     * 币种（字典account_currency）
+     */
+    private String currency;
+
+    /**
+     * 往来金额
+     */
+    private String amount;
+
+    /**
+     * 是否流水 1是 0否
+     */
+    private String isFlowingWater;
+
+    /**
+     * 往来账户
+     */
+    private Long accountId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -0,0 +1,31 @@
+package com.fjhx.account.entity.transaction.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 往来单位
+ * </p>
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@Getter
+@Setter
+@TableName("transaction_department")
+public class TransactionDepartment extends BasePo {
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.transaction.vo;
+
+import com.fjhx.account.entity.transaction.po.TransactionDepartment;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 往来单位列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@Getter
+@Setter
+public class TransactionDepartmentVo extends TransactionDepartment {
+
+}

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

@@ -0,0 +1,27 @@
+package com.fjhx.account.entity.transaction.vo;
+
+import com.fjhx.account.entity.transaction.po.Transaction;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 往来管理列表查询返回值实体
+ *
+ * @author
+ * @since 2023-06-26
+ */
+@Getter
+@Setter
+public class TransactionVo extends Transaction {
+
+    /**
+     * 往来单位名称
+     */
+    private String departmentName;
+
+    /**
+     * 往来账户名称
+     */
+    private String accountName;
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.write.dto;
+
+import com.fjhx.account.entity.write.po.WriteOffRecords;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 冲销记录表新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-12
+ */
+@Getter
+@Setter
+public class WriteOffRecordsDto extends WriteOffRecords {
+
+}

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

@@ -0,0 +1,27 @@
+package com.fjhx.account.entity.write.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 冲销记录表列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-12
+ */
+@Getter
+@Setter
+public class WriteOffRecordsSelectDto extends BaseSelectDto {
+
+    /**
+     * 归属公司
+     */
+    private Long corporationId;
+
+    /**
+     * 数据来源过滤
+     */
+    private Integer type;
+
+}

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

@@ -0,0 +1,38 @@
+package com.fjhx.account.entity.write.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 冲销记录表
+ * </p>
+ *
+ * @author
+ * @since 2023-07-12
+ */
+@Getter
+@Setter
+@TableName("write_off_records")
+public class WriteOffRecords extends BasePo {
+
+    /**
+     * 打款id
+     */
+    private Long accountPaymentId;
+
+    /**
+     * 打款时间
+     */
+    private Date accountPaymentDate;
+
+    /**
+     * 冲销原因
+     */
+    private String remark;
+
+}

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

@@ -0,0 +1,58 @@
+package com.fjhx.account.entity.write.vo;
+
+import com.fjhx.account.entity.write.po.WriteOffRecords;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 冲销记录表列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-12
+ */
+@Getter
+@Setter
+public class WriteOffRecordsVo extends WriteOffRecords {
+
+    /**
+     * 归属公司
+     */
+    private Long corporationId;
+    /**
+     * 数据来源
+     */
+    private Integer type;
+    /**
+     * 合同编号列表
+     */
+    private String contractCodes;
+    /**
+     * 申请时间
+     */
+    private Date applicationTime;
+    /**
+     * 申请金额
+     */
+    private BigDecimal amount;
+    /**
+     * 币种
+     */
+    private String currency;
+    /**
+     * 打款业务id
+     */
+    private Long businessId;
+
+    /**
+     * 归属公司名称
+     */
+    private String corporationName;
+    /**
+     * 冲销人名称
+     */
+    private String WriteOffUserName;
+
+}

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

@@ -0,0 +1,250 @@
+package com.fjhx.account.flow;
+
+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.fjhx.account.entity.account.dto.AccountPaymentDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+import com.fjhx.account.entity.account.enums.AccountRequestFundsStatusEnum;
+import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.account.service.account.AccountPaymentService;
+import com.fjhx.account.service.account.AccountRequestFundsDetailService;
+import com.fjhx.account.service.account.AccountRequestFundsService;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.common.enums.FlowStatusEnum1;
+import com.fjhx.common.utils.Assert;
+import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.flow.core.FlowThreadLocalUtil;
+import com.fjhx.flow.enums.FlowStatusEnum;
+import com.ruoyi.common.core.domain.BasePo;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+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 {
+
+    @Autowired
+    private AccountPaymentService accountPaymentService;
+
+    @Autowired
+    private AccountRequestFundsService accountRequestFundsService;
+
+    @Autowired
+    private AccountRequestFundsDetailService accountRequestFundsDetailService;
+
+    @Override
+    public String getFlowKey() {
+        return "account_request_funds_flow";
+    }
+
+
+    /**
+     * 发起流程
+     *
+     * @param flowId     流程ID
+     * @param submitData 请款表信息
+     * @return
+     */
+    @Override
+    public Long start(Long flowId, JSONObject submitData) {
+//
+//        // 获取提交数据
+//        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
+//
+//        // 添加请款表的信息
+//        accountRequestFundsDto.setStatus(AccountRequestFundsStatusEnum.UNDER_REVIEW.getKey());
+//        accountRequestFundsService.save(accountRequestFundsDto);
+//
+//        // 添加请款详情表的信息
+//        List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDto.getAccountRequestFundsDetailList();
+//        if (CollectionUtils.isNotEmpty(accountRequestFundsDetailList)) {
+//            accountRequestFundsDetailList.forEach(item -> item.setAccountRequestFundsId(accountRequestFundsDto.getId()));
+//            accountRequestFundsDetailService.saveBatch(accountRequestFundsDetailList);
+//        }
+//
+//        // 添加附件信息
+//        ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(), accountRequestFundsDto.getId());
+//
+//        return accountRequestFundsDto.getId();
+
+        // 获取提交数据
+        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
+
+        accountRequestFundsDto = commStart(accountRequestFundsDto, 0);
+
+        return accountRequestFundsDto.getId();
+    }
+
+    /**
+     * 结束流程
+     *
+     * @param flowId     流程ID
+     * @param businessId 业务ID
+     * @param submitData 请款表信息
+     */
+    @Override
+    public void end(Long flowId, Long businessId, JSONObject submitData) {
+        // 通过业务ID查询请款数据
+        AccountRequestFunds accountRequestFunds = accountRequestFundsService.getById(businessId);
+        if (ObjectUtils.isEmpty(accountRequestFunds)) {
+            throw new ServiceException("请款表的数据不存在");
+        }
+
+        // 修改请款状态为审批通过
+        accountRequestFunds.setStatus(AccountRequestFundsStatusEnum.PASS.getKey());
+
+        // 修改核销状态以及预支单核销状态为已核销
+        if ("3".equals(accountRequestFunds.getType())) {
+            accountRequestFunds.setWriteOffStatus(1);
+            // 修改预支单核销状态
+            AccountRequestFunds advance = accountRequestFundsService.getById(accountRequestFunds.getAdvanceId());
+            Assert.notEmpty(advance, "查询不到关联预支单信息");
+            advance.setWriteOffStatus(1);
+            accountRequestFundsService.updateById(advance);
+        }
+
+        accountRequestFundsService.updateById(accountRequestFunds);
+
+        // 添加打款的数据
+        addPayment(accountRequestFunds);
+
+    }
+
+    /**
+     * 重新发起
+     */
+    @Override
+    public void relaunch(Long flowId, Long businessId, FlowStatusEnum flowStatus, JSONObject submitData) {
+        super.relaunch(flowId, businessId, flowStatus, submitData);
+        reStart();
+    }
+
+    /**
+     * 驳回
+     */
+    @Override
+    public void reject(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.reject(flowId, businessId, flowStatus);
+        accountRequestFundsService.update(q -> q
+                .eq(AccountRequestFunds::getId, businessId)
+                .set(AccountRequestFunds::getStatus, FlowStatusEnum1.REJECT.getKey())//20为驳回
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    @Override
+    public void cancellation(Long flowId, Long businessId, FlowStatusEnum flowStatus) {
+        super.cancellation(flowId, businessId, flowStatus);
+
+        accountRequestFundsService.update(q -> q
+                .eq(AccountRequestFunds::getId, businessId)
+                .set(AccountRequestFunds::getStatus, FlowStatusEnum1.CANCELLATION.getKey())
+                .set(BasePo::getUpdateTime, new Date())
+                .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
+        );
+    }
+
+    /**
+     * 添加打款表的数据
+     */
+    private void addPayment(AccountRequestFunds accountRequestFunds) {
+        AccountPaymentDto accountPayment = new AccountPaymentDto();
+
+        accountPayment.setDepartmentId(accountRequestFunds.getDepartmentId());
+        accountPayment.setCorporationId(accountRequestFunds.getCorporationId());
+        accountPayment.setBusinessId(accountRequestFunds.getId());
+        accountPayment.setPaymentTime(accountRequestFunds.getPaymentTime());
+        accountPayment.setCurrency(accountRequestFunds.getCurrency());
+        accountPayment.setStatus(PaymentStatusEnum.UNDER_REVIEW.getKey());
+        accountPayment.setType(accountRequestFunds.getType());
+        accountPayment.setPaymentRemark(accountRequestFunds.getPaymentRemarks());
+        accountPayment.setPaymentMethod(accountRequestFunds.getPaymentMethod());
+        accountPayment.setIncomeAmount(accountRequestFunds.getTotal());
+        accountPayment.setName(accountRequestFunds.getName());
+        accountPayment.setBusinessManagementId(accountRequestFunds.getAccountManagementId());
+        accountPayment.setOpeningBank(accountRequestFunds.getOpeningBank());
+        accountPayment.setAccountOpening(accountRequestFunds.getAccountOpening());
+        accountPayment.setInterbankNumber(accountRequestFunds.getInterbankNumber());
+        accountPayment.setDataUser(accountRequestFunds.getCreateUser());
+        accountPayment.setAmount(BigDecimal.ZERO);
+
+        // 如果是核销 核销数据审批通过后，根据“核销总额 - 预支总额”生成“待打款”数据
+        if ("3".equals(accountRequestFunds.getType())) {
+            BigDecimal subtract = accountRequestFunds.getTotal().subtract(accountRequestFunds.getAdvanceAmounts());
+            accountPayment.setIncomeAmount(subtract);
+            if (subtract.compareTo(BigDecimal.ZERO) <= 0) {//不生成打款数据
+                return;
+            }
+        } else {
+            accountPayment.setIncomeAmount(accountRequestFunds.getTotal());
+        }
+
+        accountPaymentService.save(accountPayment);
+    }
+
+
+    /**
+     * 开始公共代码抽取
+     *
+     * @param opType 操作类型 0直接发起 1重新发起
+     */
+    private AccountRequestFundsDto commStart(AccountRequestFundsDto accountRequestFundsDto, Integer opType) {
+        if (opType == 1) {
+            Assert.notEmpty(accountRequestFundsDto.getId(), "请款id不能为空");
+        }
+
+        // 添加请款表的信息
+        accountRequestFundsDto.setStatus(AccountRequestFundsStatusEnum.UNDER_REVIEW.getKey());
+        accountRequestFundsService.saveOrUpdate(accountRequestFundsDto);
+
+        // 添加请款详情表的信息
+        List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDto.getAccountRequestFundsDetailList();
+        if (CollectionUtils.isNotEmpty(accountRequestFundsDetailList)) {
+            if (opType == 1) {
+                //先删除被删除的产品
+                accountRequestFundsDetailService.editLinked(accountRequestFundsDetailList, AccountRequestFundsDetail::getContractId, accountRequestFundsDto.getId());
+            }
+
+            accountRequestFundsDetailList.forEach(item -> item.setAccountRequestFundsId(accountRequestFundsDto.getId()));
+            accountRequestFundsDetailService.saveOrUpdateBatch(accountRequestFundsDetailList);
+        }
+
+        if (opType == 1) {
+            // 编辑附件信息
+            ObsFileUtil.editFile(accountRequestFundsDto.getFileList(), accountRequestFundsDto.getId());
+        } else {
+            // 添加附件信息
+            ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(), accountRequestFundsDto.getId());
+        }
+        return accountRequestFundsDto;
+    }
+
+    /**
+     * 重新发起
+     */
+    public void reStart() {
+        JSONObject submitData = FlowThreadLocalUtil.getCurrentData();
+        // 获取提交数据
+        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
+        commStart(accountRequestFundsDto, 1);
+    }
+
+}

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

@@ -0,0 +1,27 @@
+package com.fjhx.account.mapper.account;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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,41 @@
+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.fjhx.account.entity.account.vo.AccountRunningWaterVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 部门-资金流水关联表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-13
+ */
+public interface AccountDeptRunningWaterMapper extends BaseMapper<AccountDeptRunningWater> {
+
+    /**
+     * 部门-资金流水关联表分页
+     */
+    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page,@Param("ew") QueryWrapper<Object> wrapper);
+
+    /**
+     * 部门-资金流水统计列表
+     */
+    List<AccountRunningWaterVo> DeptRunningWaterReport(@Param("ew") QueryWrapper<Object> query);
+
+    /**
+     * 查询部门-资金流水统计信息
+     * @param query
+     * @return
+     */
+    List<AccountRunningWaterVo> deptRunningWaterStatistics(@Param("ew") QueryWrapper<Object> query);
+}

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

@@ -0,0 +1,37 @@
+package com.fjhx.account.mapper.account;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fjhx.account.entity.account.dto.AccountManagementDto;
+import com.fjhx.account.entity.account.po.AccountManagement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.vo.AccountManagementVo;
+import com.ruoyi.common.annotation.TenantIgnore;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 账户-管理表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-04-06
+ */
+public interface AccountManagementMapper extends BaseMapper<AccountManagement> {
+
+    /**
+     * 账户-管理表分页
+     */
+    Page<AccountManagementVo> getPage(@Param("page") Page<Object> page, @Param("ew")LambdaQueryWrapper<AccountManagement> wrapper);
+
+    /**
+     * 查询云帆资金账户表的信息
+     */
+//    @TenantIgnore
+//    List<FundAccount> importsAmount(AccountManagementDto dto);
+}

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<AccountPaymentVo> 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/mapper/account/AccountPaymentRecordsMapper.java

@@ -0,0 +1,17 @@
+package com.fjhx.account.mapper.account;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.account.entity.account.po.AccountPaymentRecords;
+
+
+/**
+ * <p>
+ * 打款记录 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-09-04
+ */
+public interface AccountPaymentRecordsMapper extends BaseMapper<AccountPaymentRecords> {
+
+}

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

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