提交

code/src/test/java/DingDingDataSource.java

@@ -1,5 +1,3 @@
-import fly.generator.GeneratorApplication;
-
 public class DingDingDataSource {
 
 //    public static void main(String[] args) {

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

@@ -1,16 +1,17 @@
 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.entity.account.dto.AccountDeptRunningWaterSelectDto;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.service.account.AccountDeptRunningWaterService;
+import com.fjhx.common.constant.SourceConstant;
 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;
@@ -41,7 +42,6 @@ public class AccountDeptRunningWaterController {
     }
 
 
-
     /**
      * 部门-资金流水关联表新增
      */
@@ -52,21 +52,23 @@ public class AccountDeptRunningWaterController {
 
     /**
      * 部门-资金流水报表
+     *
      * @param dto
      * @return
      */
     @PostMapping("/DeptRunningWaterReport")
-    public  List<Map<String,Object>> DeptRunningWaterReport(@RequestBody AccountDeptRunningWaterSelectDto dto){
+    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){
+    public Map<String, Object> deptRunningWaterStatistics(@RequestBody AccountDeptRunningWaterSelectDto dto) {
         return accountDeptRunningWaterService.deptRunningWaterStatistics(dto);
     }
 

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

@@ -1,18 +1,19 @@
 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.entity.account.dto.AccountDeptRunningWaterDetailSelectDto;
+import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
+import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.service.account.AccountDeptRunningWaterDetailService;
+import com.fjhx.common.constant.SourceConstant;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
+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;
 
 
 /**

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

@@ -4,8 +4,6 @@ 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;
@@ -88,7 +86,7 @@ public class AccountManagementController {
      * 账户统计(账户列表)
      */
     @PostMapping("/managementStatistics")
-    public  List<Map<String, Object>> managementStatistics(@RequestBody AccountManagementSelectDto dto) {
+    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

@@ -1,17 +1,18 @@
 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.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.vo.AccountPaymentVo;
 import com.fjhx.account.service.account.AccountPaymentService;
+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;
 
 
 /**
@@ -55,5 +56,4 @@ public class AccountPaymentController {
     }
 
 
-
 }

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

@@ -1,13 +1,16 @@
 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.entity.account.dto.AccountRemainderSelectDto;
+import com.fjhx.account.entity.account.vo.AccountRemainderVo;
 import com.fjhx.account.service.account.AccountRemainderService;
+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;
 
 
 /**
@@ -15,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 账户-余额表 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 @RestController

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

@@ -1,15 +1,18 @@
 package com.fjhx.account.controller.account;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.common.constant.SourceConstant;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.account.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;
 
 
 /**

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

@@ -1,21 +1,24 @@
 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.entity.account.dto.AccountRequestFundsDetailSelectDto;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
+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;
 
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 @RestController

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

@@ -1,16 +1,19 @@
 package com.fjhx.account.controller.account;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.fjhx.account.entity.account.po.AccountRunningWater;
-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.AccountRunningWaterVo;
-import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
 import com.fjhx.account.entity.account.dto.AccountRunningWaterDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+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;
@@ -84,8 +87,8 @@ public class AccountRunningWaterController {
      * 账户资金流水表导出excel
      */
     @PostMapping("/exportExcel")
-    public void exportExcel(@RequestBody AccountRunningWaterSelectDto dto,HttpServletResponse httpServletResponse) {
-        accountRunningWaterService.exportExcel(dto,httpServletResponse);
+    public void exportExcel(@RequestBody AccountRunningWaterSelectDto dto, HttpServletResponse httpServletResponse) {
+        accountRunningWaterService.exportExcel(dto, httpServletResponse);
     }
 
 }

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

@@ -1,6 +1,5 @@
 package com.fjhx.account.controller.utils;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -3,6 +3,7 @@ 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;
 

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

@@ -31,7 +31,7 @@ public class AccountDeptRunningWaterSelectDto extends BaseSelectDto {
     private String keyword;
 
     /**
-     *是否分拆（10未分拆  20 已分拆）
+     * 是否分拆（10未分拆  20 已分拆）
      */
     private String type;
 
@@ -51,7 +51,7 @@ public class AccountDeptRunningWaterSelectDto extends BaseSelectDto {
     private Long accountManagementId;
 
     /**
-     *摘要
+     * 摘要
      */
     private String remarks;
 

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

@@ -39,7 +39,4 @@ public class AccountPaymentDto extends AccountPayment {
     private String accountOpening;
 
 
-
-
-
 }

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 打款表列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
 @Getter

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 账户-余额表新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 @Getter

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 账户-余额表列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 @Getter

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

@@ -1,12 +1,9 @@
 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;
-
 /**
  * 新增编辑入参实体
  *

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 账户资金流水表新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 @Getter

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

@@ -19,7 +19,6 @@ 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;
@@ -34,7 +33,7 @@ import java.util.Date;
 @Data
 @TableName("t_erp_fund_account")
 
-public class FundAccount{
+public class FundAccount {
 
     private static final long serialVersionUID = 1L;
 
@@ -164,5 +163,4 @@ public class FundAccount{
     private Date updateTime;
 
 
-
 }

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

@@ -9,14 +9,12 @@ import java.util.Map;
 public enum AccountRequestFundsStatusEnum {
     UNDER_REVIEW("10", "审批中"),
     REJECT("20", "驳回"),
-    PASS("30","审批通过"),
+    PASS("30", "审批通过"),
     ;
+    private static Map<String, String> map = new LinkedHashMap<>();
     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;

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

@@ -10,12 +10,10 @@ public enum PaymentStatusEnum {
     UNDER_REVIEW("20", "未打款"),
     REJECT("10", "已打款"),
     ;
+    private static Map<String, String> map = new LinkedHashMap<>();
     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;

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

@@ -11,12 +11,10 @@ public enum PaymentTypeEnum {
     REJECT("20", "采购付款"),
     RECEIVE("30", "退货到款登记"),
     ;
+    private static Map<String, String> map = new LinkedHashMap<>();
     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;

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

@@ -1,8 +1,7 @@
 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 com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,7 +19,6 @@ import lombok.Setter;
 public class AccountDeptRunningWater extends BasePo {
 
 
-
     /**
      * 资金流水表ID
      */

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

@@ -1,12 +1,12 @@
 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 com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 资金流水分拆部门表

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

@@ -49,7 +49,6 @@ public class AccountManagement extends BasePo {
     private String interbankNumber;
 
 
-
     /**
      * 账户名称（外汇信息）
      */
@@ -81,9 +80,6 @@ public class AccountManagement extends BasePo {
     private String beneficiaryAddress;
 
 
-
-
-
 //    /**
 //     * 云帆ID
 //     */
@@ -101,6 +97,4 @@ public class AccountManagement extends BasePo {
 //    private String tenantId;
 
 
-
-
 }

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

@@ -1,12 +1,13 @@
 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 com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 打款表

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

@@ -1,12 +1,12 @@
 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 com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 账户-余额表
@@ -43,7 +43,7 @@ public class AccountRemainder extends BasePo {
     /**
      * 交易状态：10 收入，20支出
      */
-    private String status ;
+    private String status;
 
     /**
      * 交易状态：10 收入，20支出

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

@@ -1,12 +1,13 @@
 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 com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 请款表

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

@@ -1,12 +1,12 @@
 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 com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  *

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

@@ -1,14 +1,14 @@
 package com.fjhx.account.entity.account.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+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>

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 账户-管理表列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 @Getter

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

@@ -20,23 +20,23 @@ public class AccountPaymentVo extends AccountPayment {
     private String deptName;
 
     /**
-     *归属公司名称
+     * 归属公司名称
      */
     private String corporationName;
 
     /**
      * 用户名称
      */
-    private  String userName;
+    private String userName;
 
 
     /**
      * 实际打款的付款账户名称
      */
-    private  String accountManagementName;
+    private String accountManagementName;
 
     /**
      * 业务中选中的付款账户名称
      */
-    private  String businessManagementName;
+    private String businessManagementName;
 }

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 账户-余额表列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 @Getter

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

@@ -1,6 +1,5 @@
 package com.fjhx.account.entity.account.vo;
 
-import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
 import lombok.Getter;
@@ -44,7 +43,7 @@ public class AccountRunningWaterVo extends AccountRunningWater {
     private Long accountDeptRunningWaterId;
 
     /**
-     *资金流水-部门关联表列表
+     * 资金流水-部门关联表列表
      */
     private List<AccountDeptRunningWaterDetail> deptRunningWaterDetailList;
 

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

@@ -18,14 +18,15 @@ import com.fjhx.account.service.account.AccountRequestFundsService;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
-import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 /**
- *  请款流程
+ * 请款流程
+ *
  * @Author:caozj
  * @DATE:2023/4/3 17:38
  */
@@ -43,7 +44,8 @@ public class AccountRequestFundsFlow extends FlowDelegate {
 
     /**
      * 发起流程
-     * @param flowId 流程ID
+     *
+     * @param flowId     流程ID
      * @param submitData 请款表信息
      * @return
      */
@@ -52,37 +54,38 @@ public class AccountRequestFundsFlow extends FlowDelegate {
 //        DynamicDataSourceContextHolder.push(SourceConstant.ACCOUNT);
         AccountRequestFundsService accountRequestFundsService = SpringUtil.getBean(AccountRequestFundsService.class);
         AccountRequestFundsDetailService accountRequestFundsDetailService = SpringUtil.getBean(AccountRequestFundsDetailService.class);
-        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject( AccountRequestFundsDto.class);
+        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
         accountRequestFundsDto.setStatus(AccountRequestFundsStatusEnum.UNDER_REVIEW.getKey());
         //添加请款表的信息
         accountRequestFundsService.save(accountRequestFundsDto);
 
         //获取请款详情表的详细信息
         List<AccountRequestFundsDetail> accountRequestFundsDetailList = accountRequestFundsDto.getAccountRequestFundsDetailList();
-        if(CollectionUtils.isNotEmpty(accountRequestFundsDetailList)){
+        if (CollectionUtils.isNotEmpty(accountRequestFundsDetailList)) {
             accountRequestFundsDetailList.forEach(accountRequestFundsDetail -> accountRequestFundsDetail
                     .setAccountRequestFundsId(accountRequestFundsDto.getId()));
             //添加请款详情表的信息
             accountRequestFundsDetailService.saveBatch(accountRequestFundsDetailList);
         }
         //添加附件信息
-        ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(),accountRequestFundsDto.getId());
+        ObsFileUtil.saveFile(accountRequestFundsDto.getFileList(), accountRequestFundsDto.getId());
         return accountRequestFundsDto.getId();
     }
 
     /**
      * 结束流程
-     * @param flowId 流程ID
+     *
+     * @param flowId     流程ID
      * @param businessId 业务ID
-     * @param submitData  请款表信息
+     * @param submitData 请款表信息
      */
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
         AccountRequestFundsService accountRequestFundsService = SpringUtil.getBean(AccountRequestFundsService.class);
         //通过业务ID查询申购数据
         AccountRequestFunds accountRequestFunds = accountRequestFundsService.getById(businessId);
-        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject( AccountRequestFundsDto.class);
-        if(ObjectUtils.isEmpty(accountRequestFunds)){
+        AccountRequestFundsDto accountRequestFundsDto = submitData.toJavaObject(AccountRequestFundsDto.class);
+        if (ObjectUtils.isEmpty(accountRequestFunds)) {
             throw new ServiceException("请款表的数据不存在");
         }
         //修改申购状态为审批通过
@@ -95,7 +98,7 @@ public class AccountRequestFundsFlow extends FlowDelegate {
     /**
      * 添加打款表的数据
      */
-    private void addPayment(AccountRequestFundsDto accountRequestFundsDto){
+    private void addPayment(AccountRequestFundsDto accountRequestFundsDto) {
         AccountPaymentDto accountPayment = new AccountPaymentDto();
         accountPayment.setBusinessId(accountRequestFundsDto.getId());
         accountPayment.setType(PaymentTypeEnum.UNDER_REVIEW.getKey());

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

@@ -1,9 +1,8 @@
 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.po.AccountDeptRunningWaterDetail;
 import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;

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

@@ -1,12 +1,10 @@
 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.po.AccountDeptRunningWater;
 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;
@@ -25,7 +23,7 @@ public interface AccountDeptRunningWaterMapper extends BaseMapper<AccountDeptRun
     /**
      * 部门-资金流水关联表分页
      */
-    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page,@Param("ew") QueryWrapper<Object> wrapper);
+    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
 
     /**
      * 部门-资金流水统计列表
@@ -34,6 +32,7 @@ public interface AccountDeptRunningWaterMapper extends BaseMapper<AccountDeptRun
 
     /**
      * 查询部门-资金流水统计信息
+     *
      * @param query
      * @return
      */

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

@@ -1,18 +1,12 @@
 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.po.AccountManagement;
 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>
@@ -27,7 +21,7 @@ public interface AccountManagementMapper extends BaseMapper<AccountManagement> {
     /**
      * 账户-管理表分页
      */
-    Page<AccountManagementVo> getPage(@Param("page") Page<Object> page, @Param("ew")LambdaQueryWrapper<AccountManagement> wrapper);
+    Page<AccountManagementVo> getPage(@Param("page") Page<Object> page, @Param("ew") LambdaQueryWrapper<AccountManagement> wrapper);
 
     /**
      * 查询云帆资金账户表的信息

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

@@ -1,12 +1,10 @@
 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.po.AccountPayment;
 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;
 
 
@@ -27,6 +25,7 @@ public interface AccountPaymentMapper extends BaseMapper<AccountPayment> {
 
     /**
      * 查询打款详情
+     *
      * @param id
      * @return
      */

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

@@ -1,8 +1,8 @@
 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.po.AccountRemainder;
 import com.fjhx.account.entity.account.vo.AccountRemainderVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * 账户-余额表 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-06
  */
 public interface AccountRemainderMapper extends BaseMapper<AccountRemainder> {

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

@@ -1,8 +1,8 @@
 package com.fjhx.account.mapper.account;
 
-import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -12,10 +12,10 @@ import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 public interface AccountRequestFundsDetailMapper extends BaseMapper<AccountRequestFundsDetail> {
@@ -27,6 +27,7 @@ public interface AccountRequestFundsDetailMapper extends BaseMapper<AccountReque
 
     /**
      * 获取列表根据合同ID
+     *
      * @param contractId
      * @return
      */

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

@@ -1,11 +1,10 @@
 package com.fjhx.account.mapper.account;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fjhx.account.entity.account.po.AccountRequestFunds;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
 

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

@@ -1,11 +1,10 @@
 package com.fjhx.account.mapper.account;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
 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;
@@ -24,10 +23,11 @@ public interface AccountRunningWaterMapper extends BaseMapper<AccountRunningWate
     /**
      * 账户资金流水表分页
      */
-    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page, @Param("ew")QueryWrapper<Object> wrapper);
+    Page<AccountRunningWaterVo> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
 
     /**
      * 查询至今账户详情
+     *
      * @param id
      * @return
      */

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

@@ -1,14 +1,12 @@
 package com.fjhx.account.service.account;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailDto;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailSelectDto;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
+import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
-import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailSelectDto;
-import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailDto;
-
-import java.util.List;
 
 
 /**

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

@@ -1,12 +1,12 @@
 package com.fjhx.account.service.account;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterSelectDto;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
+import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
-import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterSelectDto;
-import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
 
 import java.util.List;
 import java.util.Map;
@@ -49,13 +49,15 @@ public interface AccountDeptRunningWaterService extends BaseService<AccountDeptR
 
     /**
      * 部门-资金流水报表
+     *
      * @param dto
      * @return
      */
-    List<Map<String,Object>> DeptRunningWaterReport(AccountDeptRunningWaterSelectDto dto);
+    List<Map<String, Object>> DeptRunningWaterReport(AccountDeptRunningWaterSelectDto dto);
 
     /**
      * 部门-资金流水统计（ 部门-资金流水列表）
+     *
      * @param dto
      * @return
      */

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

@@ -1,13 +1,11 @@
 package com.fjhx.account.service.account;
 
-import com.fjhx.account.entity.account.po.AccountManagement;
-import com.fjhx.account.entity.account.po.AccountRemainder;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountManagementVo;
-import com.fjhx.account.entity.account.dto.AccountManagementSelectDto;
 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.vo.AccountManagementVo;
+import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,13 +1,11 @@
 package com.fjhx.account.service.account;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.dto.AccountPaymentDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.po.AccountPayment;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
-import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.vo.AccountPaymentVo;
-import com.fjhx.account.entity.account.dto.AccountPaymentSelectDto;
-import com.fjhx.account.entity.account.dto.AccountPaymentDto;
+import com.ruoyi.common.core.service.BaseService;
 
 
 /**

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

@@ -1,11 +1,11 @@
 package com.fjhx.account.service.account;
 
-import com.fjhx.account.entity.account.po.AccountRemainder;
-import com.ruoyi.common.core.service.BaseService;
 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.fjhx.account.entity.account.dto.AccountRemainderSelectDto;
+import com.fjhx.account.entity.account.po.AccountRemainder;
+import com.fjhx.account.entity.account.vo.AccountRemainderVo;
+import com.ruoyi.common.core.service.BaseService;
 
 
 /**

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

@@ -1,21 +1,21 @@
 package com.fjhx.account.service.account;
 
-import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailSelectDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailSelectDto;
+import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
+import com.ruoyi.common.core.service.BaseService;
 
 import java.util.List;
 
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 public interface AccountRequestFundsDetailService extends BaseService<AccountRequestFundsDetail> {
@@ -47,6 +47,7 @@ public interface AccountRequestFundsDetailService extends BaseService<AccountReq
 
     /**
      * 根据合同ID获取列表
+     *
      * @param contractId
      * @return
      */

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

@@ -1,11 +1,11 @@
 package com.fjhx.account.service.account;
 
-import com.fjhx.account.entity.account.po.AccountRequestFunds;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
+import com.fjhx.account.entity.account.po.AccountRequestFunds;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+import com.ruoyi.common.core.service.BaseService;
 
 
 /**
@@ -13,7 +13,7 @@ import com.fjhx.account.entity.account.dto.AccountRequestFundsDto;
  * 请款表 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 public interface AccountRequestFundsService extends BaseService<AccountRequestFunds> {

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

@@ -1,12 +1,12 @@
 package com.fjhx.account.service.account;
 
+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.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.core.service.BaseService;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
-import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
-import com.fjhx.account.entity.account.dto.AccountRunningWaterDto;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;

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

@@ -1,26 +1,24 @@
 package com.fjhx.account.service.account.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailDto;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailSelectDto;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.mapper.account.AccountDeptRunningWaterDetailMapper;
 import com.fjhx.account.service.account.AccountDeptRunningWaterDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.account.service.account.AccountDeptRunningWaterService;
 import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterDetailVo;
-import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDetailDto;
-import cn.hutool.core.bean.BeanUtil;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -59,12 +57,12 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
         //查询资金流水信息
         AccountRunningWater accountRunningWater = accountRunningWaterService.getById(id);
         AccountRunningWaterVo accountRunningWaterVo = BeanUtil.toBean(accountRunningWater, AccountRunningWaterVo.class);
-            //判断是否有添加部门-资金流水表的信息
-        if (ObjectUtil.isNotEmpty(accountRunningWaterVo)){
+        //判断是否有添加部门-资金流水表的信息
+        if (ObjectUtil.isNotEmpty(accountRunningWaterVo)) {
             //查询资金流水-部门关联表的信息(一个流水对应一个部门)
             AccountDeptRunningWater accountDeptRunningWater = accountDeptRunningWaterService.getOne(Wrappers.<AccountDeptRunningWater>lambdaQuery()
                     .eq(AccountDeptRunningWater::getRunningWaterId, accountRunningWater.getId()));
-            if(ObjectUtil.isNotEmpty(accountDeptRunningWater)){
+            if (ObjectUtil.isNotEmpty(accountDeptRunningWater)) {
                 //查询资金流水分拆部门表明细
                 List<AccountDeptRunningWaterDetail> accountDeptRunningWaterDetailList = this.list(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
                         .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountDeptRunningWater.getId()));
@@ -91,10 +89,10 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
         //修改资金流水-账户表的的分拆类型为已分拆
         AccountDeptRunningWater accountDeptRunningWater = new AccountDeptRunningWater();
 
-        if (ObjectUtil.isNotEmpty(deptRunningWaterDetailList)){//分拆功能
+        if (ObjectUtil.isNotEmpty(deptRunningWaterDetailList)) {//分拆功能
             //分拆功能 添加或者修改资金流水分拆部门表的数据
-          saveOrEditAccountDeptRunningWaterDetail(accountRunningWaterVo,accountDeptRunningWater,deptRunningWaterDetailList);
-        }else {//调整部门功能
+            saveOrEditAccountDeptRunningWaterDetail(accountRunningWaterVo, accountDeptRunningWater, deptRunningWaterDetailList);
+        } else {//调整部门功能
             //添加部门-资金流水关联表
             AccountDeptRunningWaterDetail accountDeptRunningWaterDetail = new AccountDeptRunningWaterDetail();
             accountDeptRunningWaterDetail.setDeptRunningWaterId(accountRunningWaterVo.getAccountDeptRunningWaterId());
@@ -105,29 +103,29 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
             accountDeptRunningWater.setRunningWaterId(accountRunningWaterVo.getId());
             accountDeptRunningWater.setType("10");
             //如果部门-资金流水关联表ID不为null修改资金流水分拆部门表的数据
-           if (ObjectUtil.isNotEmpty(accountRunningWaterVo.getAccountDeptRunningWaterId())){
-               //查询部门-资金流水关联表的数据（获取到部门-资金流水关联表中的数据是否分拆，如果是分拆则删除资金流水分拆部门表的数据，否则修改资金流水分拆部门表的数据在添加资金流水分拆部门表的数据）
-               AccountDeptRunningWater accountDeptRunningWater1 = accountDeptRunningWaterService.getById(accountRunningWaterVo.getAccountDeptRunningWaterId());
-
-               if (accountDeptRunningWater1.getType().equals("20")){
-                   accountDeptRunningWater.setId(accountRunningWaterVo.getAccountDeptRunningWaterId());
-                  accountDeptRunningWaterService.updateById(accountDeptRunningWater);
-                   //删除资金流水分拆部门表的数据
-                   baseMapper.delete(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
-                           .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId,accountRunningWaterVo.getAccountDeptRunningWaterId()));
-                   baseMapper.insert(accountDeptRunningWaterDetail);
-
-               }else if (accountDeptRunningWater1.getType().equals("10")){
-                   //修改资金流水分拆部门表的数据的数据
-                   baseMapper.update(accountDeptRunningWaterDetail,Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
-                           .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId,accountRunningWaterVo.getAccountDeptRunningWaterId()));
-               }
-           }else {//如果部门-资金流水关联表ID为null添加资金流水分拆部门表的数据
-               //添加部门-资金流水关联表的信息
-               accountDeptRunningWaterService.save(accountDeptRunningWater);
-               accountDeptRunningWaterDetail.setDeptRunningWaterId(accountDeptRunningWater.getId());
-               baseMapper.insert(accountDeptRunningWaterDetail);
-           }
+            if (ObjectUtil.isNotEmpty(accountRunningWaterVo.getAccountDeptRunningWaterId())) {
+                //查询部门-资金流水关联表的数据（获取到部门-资金流水关联表中的数据是否分拆，如果是分拆则删除资金流水分拆部门表的数据，否则修改资金流水分拆部门表的数据在添加资金流水分拆部门表的数据）
+                AccountDeptRunningWater accountDeptRunningWater1 = accountDeptRunningWaterService.getById(accountRunningWaterVo.getAccountDeptRunningWaterId());
+
+                if (accountDeptRunningWater1.getType().equals("20")) {
+                    accountDeptRunningWater.setId(accountRunningWaterVo.getAccountDeptRunningWaterId());
+                    accountDeptRunningWaterService.updateById(accountDeptRunningWater);
+                    //删除资金流水分拆部门表的数据
+                    baseMapper.delete(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
+                            .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountRunningWaterVo.getAccountDeptRunningWaterId()));
+                    baseMapper.insert(accountDeptRunningWaterDetail);
+
+                } else if (accountDeptRunningWater1.getType().equals("10")) {
+                    //修改资金流水分拆部门表的数据的数据
+                    baseMapper.update(accountDeptRunningWaterDetail, Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
+                            .eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId, accountRunningWaterVo.getAccountDeptRunningWaterId()));
+                }
+            } else {//如果部门-资金流水关联表ID为null添加资金流水分拆部门表的数据
+                //添加部门-资金流水关联表的信息
+                accountDeptRunningWaterService.save(accountDeptRunningWater);
+                accountDeptRunningWaterDetail.setDeptRunningWaterId(accountDeptRunningWater.getId());
+                baseMapper.insert(accountDeptRunningWaterDetail);
+            }
         }
 
     }
@@ -146,9 +144,9 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
     private void saveOrEditAccountDeptRunningWaterDetail(AccountRunningWaterVo accountRunningWaterVo,
                                                          AccountDeptRunningWater accountDeptRunningWater,
                                                          List<AccountDeptRunningWaterDetail> deptRunningWaterDetailList
-    ){
+    ) {
         //如果存在部门-资金流水关联表的ID则修改
-        if (ObjectUtil.isNotEmpty(accountRunningWaterVo.getAccountDeptRunningWaterId())){
+        if (ObjectUtil.isNotEmpty(accountRunningWaterVo.getAccountDeptRunningWaterId())) {
             accountDeptRunningWater.setId(accountRunningWaterVo.getAccountDeptRunningWaterId());
             accountDeptRunningWater.setType("20");
             accountDeptRunningWaterService.updateById(accountDeptRunningWater);
@@ -160,21 +158,21 @@ public class AccountDeptRunningWaterDetailServiceImpl extends ServiceImpl<Accoun
 
             //删除数据库中不包含参数中有分拆部门详情表的ID的数据
             this.remove(Wrappers.<AccountDeptRunningWaterDetail>lambdaQuery()
-                    .notIn(AccountDeptRunningWaterDetail::getId,ids).eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId,
+                    .notIn(AccountDeptRunningWaterDetail::getId, ids).eq(AccountDeptRunningWaterDetail::getDeptRunningWaterId,
                             accountRunningWaterVo.getAccountDeptRunningWaterId()));
 
-        }else {
+        } else {
             accountDeptRunningWater.setRunningWaterId(accountRunningWaterVo.getId());
             accountDeptRunningWater.setType("20");
             accountDeptRunningWaterService.save(accountDeptRunningWater);
         }
         //获取分拆部门详情中ID为null的数据
         deptRunningWaterDetailList = deptRunningWaterDetailList.stream()
-                .filter(deptRunningWaterDetail->deptRunningWaterDetail.getId()==null)
+                .filter(deptRunningWaterDetail -> deptRunningWaterDetail.getId() == null)
                 .collect(Collectors.toList());
 
         //添加资金流水分拆部门表中ID为null的数据
-        deptRunningWaterDetailList.forEach(deptRunningWaterDetail->deptRunningWaterDetail
+        deptRunningWaterDetailList.forEach(deptRunningWaterDetail -> deptRunningWaterDetail
                 .setDeptRunningWaterId(accountRunningWaterVo.getAccountDeptRunningWaterId()));
 
         this.saveBatch(deptRunningWaterDetailList);

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

@@ -1,35 +1,34 @@
 package com.fjhx.account.service.account.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.baomidou.mybatisplus.core.conditions.interfaces.Func;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.controller.utils.DateUtils;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
+import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterSelectDto;
 import com.fjhx.account.entity.account.po.AccountDeptRunningWater;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsVo;
+import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.mapper.account.AccountDeptRunningWaterMapper;
 import com.fjhx.account.service.account.AccountDeptRunningWaterService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
-import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountDeptRunningWaterVo;
-import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.account.entity.account.dto.AccountDeptRunningWaterDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 
@@ -54,19 +53,19 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arw.status", dto.getStatus());
         //币种
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getCurrency()), "arw.currency", dto.getCurrency());
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()),"adrw.type",dto.getType());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()), "adrw.type", dto.getType());
         //归属公司id
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCorporationId()),"am.corporation_id",dto.getCorporationId());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getCorporationId()), "am.corporation_id", dto.getCorporationId());
         //摘要
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getRemarks()),"arw.remarks",dto.getRemarks());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getRemarks()), "arw.remarks", dto.getRemarks());
         //起始金额
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getBeginAmount()),"arw.amount",dto.getBeginAmount());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getBeginAmount()), "arw.amount", dto.getBeginAmount());
         //结束金额
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getEndAmount()),"arw.amount",dto.getEndAmount());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getEndAmount()), "arw.amount", dto.getEndAmount());
         //开始时间
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getBeginTime()),"arw.create_time",dto.getBeginTime());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getBeginTime()), "arw.create_time", dto.getBeginTime());
         //结束时间
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getEndTime()),"arw.create_time",dto.getEndTime());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getEndTime()), "arw.create_time", dto.getEndTime());
 //        if (StringUtils.isNotEmpty(dto.getKeyword())) {
 //            wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
 //        }
@@ -100,9 +99,9 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
      */
     @Override
     public void add(AccountDeptRunningWaterDto accountDeptRunningWaterDto) {
-        if (ObjectUtil.isNotEmpty(accountDeptRunningWaterDto.getId())){
+        if (ObjectUtil.isNotEmpty(accountDeptRunningWaterDto.getId())) {
             this.updateById(accountDeptRunningWaterDto);
-        }else {
+        } else {
             this.save(accountDeptRunningWaterDto);
         }
 
@@ -120,12 +119,13 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
 
     /**
      * 部门-资金流水报表
+     *
      * @param dto
      * @return
      */
     @Override
-    public  List<Map<String,Object>> DeptRunningWaterReport(AccountDeptRunningWaterSelectDto dto) {
-        if (ObjectUtil.isEmpty(dto.getBeginTime())&&ObjectUtil.isEmpty(dto.getEndTime())) {
+    public List<Map<String, Object>> DeptRunningWaterReport(AccountDeptRunningWaterSelectDto dto) {
+        if (ObjectUtil.isEmpty(dto.getBeginTime()) && ObjectUtil.isEmpty(dto.getEndTime())) {
             throw new ServiceException("查询的时间范围不能为空！");
         }
         //获取月份集合
@@ -133,28 +133,28 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
         //存放部门信息
         List<SysDept> sysDeptList = new ArrayList<>();
         //查询部门信息
-        if (ObjectUtil.isNotEmpty(dto.getDeptId())){
+        if (ObjectUtil.isNotEmpty(dto.getDeptId())) {
             //切换数据源
             DynamicDataSourceContextHolder.push(SourceConstant.BASE);
             //判断是否存在子集的部门信息
-            sysDeptList =  sysDeptService.list(Wrappers.<SysDept>lambdaQuery().like(SysDept::getAncestors,dto.getDeptId())
+            sysDeptList = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().like(SysDept::getAncestors, dto.getDeptId())
                     .orderByDesc(SysDept::getParentId));
             SysDept sysDept = sysDeptService.getById(dto.getDeptId());
             sysDeptList.add(sysDept);
-        }else {
+        } else {
             //切换数据源
             DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-            sysDeptList =  sysDeptService.list(Wrappers.<SysDept>lambdaQuery().orderByDesc(SysDept::getParentId));
+            sysDeptList = sysDeptService.list(Wrappers.<SysDept>lambdaQuery().orderByDesc(SysDept::getParentId));
         }
         //获取到部门ID
         List<Long> deptIds = sysDeptList.stream().map(sysDept -> sysDept.getDeptId()).collect(Collectors.toList());
 
         //查询资金流水表的信息
         QueryWrapper<Object> query = Wrappers.query();
-        query.ge("DATE_FORMAT(ar.create_time,'%Y-%m')", DateUtil.format(dto.getBeginTime(),"yyyy-MM"));
-        query.le("DATE_FORMAT(ar.create_time,'%Y-%m')", DateUtil.format(dto.getEndTime(),"yyyy-MM"));
-        query.in("wd.dept_id",deptIds);
-        query.groupBy("wd.dept_id","time");
+        query.ge("DATE_FORMAT(ar.create_time,'%Y-%m')", DateUtil.format(dto.getBeginTime(), "yyyy-MM"));
+        query.le("DATE_FORMAT(ar.create_time,'%Y-%m')", DateUtil.format(dto.getEndTime(), "yyyy-MM"));
+        query.in("wd.dept_id", deptIds);
+        query.groupBy("wd.dept_id", "time");
         //切换数据源
         DynamicDataSourceContextHolder.push(SourceConstant.ACCOUNT);
         List<AccountRunningWaterVo> accountRunningWaterVos = baseMapper.DeptRunningWaterReport(query);
@@ -162,30 +162,30 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
                 .collect(Collectors.groupingBy(AccountRunningWaterVo::getDeptId));
 
         //存放部门费用统计的数据
-       List<Map<String,Object>> mapList = new ArrayList<>();
+        List<Map<String, Object>> mapList = new ArrayList<>();
         for (SysDept sysDept : sysDeptList) {
-            Map<String,Object> map = new HashMap<>();
-            map.put("deptName",sysDept.getDeptName());
+            Map<String, Object> map = new HashMap<>();
+            map.put("deptName", sysDept.getDeptName());
             //获取到这个部门的费用统计报表
             List<AccountRunningWaterVo> accountRunningWaterVoList = accountRunningWaterMap.get(sysDept.getDeptId());
             //如果这个部门没有费用统计表的数据则将统计相关数据表设计为0
-            if (ObjectUtil.isEmpty(accountRunningWaterVoList)){
+            if (ObjectUtil.isEmpty(accountRunningWaterVoList)) {
                 accountRunningWaterVoList = new ArrayList<>();
                 for (String month : months) {
-                   AccountRunningWaterVo accountRunningWaterVo = new AccountRunningWaterVo();
-                   accountRunningWaterVo.setIncomeAmount(new BigDecimal(0));
-                   accountRunningWaterVo.setExpenditureAmount(new BigDecimal(0));
-                   accountRunningWaterVo.setBalanceAmount(new BigDecimal(0));
-                   accountRunningWaterVo.setTime(month);
-                   accountRunningWaterVoList.add(accountRunningWaterVo);
+                    AccountRunningWaterVo accountRunningWaterVo = new AccountRunningWaterVo();
+                    accountRunningWaterVo.setIncomeAmount(new BigDecimal(0));
+                    accountRunningWaterVo.setExpenditureAmount(new BigDecimal(0));
+                    accountRunningWaterVo.setBalanceAmount(new BigDecimal(0));
+                    accountRunningWaterVo.setTime(month);
+                    accountRunningWaterVoList.add(accountRunningWaterVo);
                 }
-            }else {
+            } else {
                 Map<String, List<AccountRunningWaterVo>> waterMap = accountRunningWaterVoList.stream()
                         .collect(Collectors.groupingBy(AccountRunningWaterVo::getTime));
 
                 for (String month : months) {//判断这个月份中是否有这个数据，如果没有则赋值为0
                     List<AccountRunningWaterVo> accountRunningWaterVos1 = waterMap.get(month);
-                    if (ObjectUtil.isEmpty(accountRunningWaterVos1)){
+                    if (ObjectUtil.isEmpty(accountRunningWaterVos1)) {
                         AccountRunningWaterVo accountRunningWaterVo = new AccountRunningWaterVo();
                         accountRunningWaterVo.setIncomeAmount(new BigDecimal(0));
                         accountRunningWaterVo.setExpenditureAmount(new BigDecimal(0));
@@ -195,7 +195,7 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
                     }
                 }
             }
-           map.put("accountRunningWaterVoList",accountRunningWaterVoList);
+            map.put("accountRunningWaterVoList", accountRunningWaterVoList);
             mapList.add(map);
         }
         return mapList;
@@ -203,6 +203,7 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
 
     /**
      * 部门-资金流水统计（ 部门-资金流水列表）
+     *
      * @param dto
      * @return
      */
@@ -214,7 +215,7 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
         QueryWrapper<Object> query = Wrappers.query();
         query.groupBy("rwd.dept_id");
         //查询部门-资金流水统计信息
-        List<AccountRunningWaterVo> accountRunningWaterVoList =  baseMapper.deptRunningWaterStatistics(query);
+        List<AccountRunningWaterVo> accountRunningWaterVoList = baseMapper.deptRunningWaterStatistics(query);
 
         //计算收入合计数据
         BigDecimal incomeAmount = accountRunningWaterVoList.stream().map(accountRunningWaterVo ->
@@ -223,8 +224,8 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
         //计算支出合计数据
         BigDecimal expenditureAmount = accountRunningWaterVoList.stream().map(accountRunningWaterVo ->
                 accountRunningWaterVo.getExpenditureAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
-        map.put("incomeAmount",incomeAmount);
-        map.put("expenditureAmount",expenditureAmount);
+        map.put("incomeAmount", incomeAmount);
+        map.put("expenditureAmount", expenditureAmount);
 
         //查询部门信息
         //切换数据源
@@ -235,11 +236,11 @@ public class AccountDeptRunningWaterServiceImpl extends ServiceImpl<AccountDeptR
         //赋值部门信息
         for (AccountRunningWaterVo accountRunningWaterVo : accountRunningWaterVoList) {
             List<SysDept> sysDepts = sysDeptMap.get(accountRunningWaterVo.getDeptId());
-            if (CollectionUtils.isNotEmpty(sysDepts)){
+            if (CollectionUtils.isNotEmpty(sysDepts)) {
                 accountRunningWaterVo.setDeptName(sysDepts.get(0).getDeptName());
             }
         }
-        map.put("accountRunningWaterVoList",accountRunningWaterVoList);
+        map.put("accountRunningWaterVoList", accountRunningWaterVoList);
         return map;
     }
 

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

@@ -1,42 +1,31 @@
 package com.fjhx.account.service.account.impl;
 
-import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.po.AccountRunningWater;
+import com.fjhx.account.entity.account.vo.AccountManagementVo;
 import com.fjhx.account.mapper.account.AccountManagementMapper;
 import com.fjhx.account.service.account.AccountManagementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.service.account.AccountRemainderService;
 import com.fjhx.account.service.account.AccountRunningWaterService;
 import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.common.entity.corporation.po.Corporation;
-import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
-import com.obs.services.internal.ServiceException;
-import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysUserService;
-import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountManagementVo;
-import com.fjhx.account.entity.account.dto.AccountManagementSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.account.entity.account.dto.AccountManagementDto;
-import cn.hutool.core.bean.BeanUtil;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -74,13 +63,13 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
     public Page<AccountManagementVo> getPage(AccountManagementSelectDto dto) {
         LambdaQueryWrapper<AccountManagement> wrapper = Wrappers.<AccountManagement>lambdaQuery();
         //根据关键字查询（查询的字段有账户别名、账户名称、账号）
-        if (StringUtils.isNotEmpty(dto.getKeyword())){
-            wrapper.and(wrapper1 ->{
-                wrapper1.like(AccountManagement::getName,dto.getKeyword()).or()
-                .like(AccountManagement::getAlias,dto.getKeyword()).or()
-                .like(AccountManagement::getAccountOpening,dto.getKeyword()).or()
-                        .like(AccountManagement::getOpeningBank,dto.getKeyword());
-            } );
+        if (StringUtils.isNotEmpty(dto.getKeyword())) {
+            wrapper.and(wrapper1 -> {
+                wrapper1.like(AccountManagement::getName, dto.getKeyword()).or()
+                        .like(AccountManagement::getAlias, dto.getKeyword()).or()
+                        .like(AccountManagement::getAccountOpening, dto.getKeyword()).or()
+                        .like(AccountManagement::getOpeningBank, dto.getKeyword());
+            });
         }
         Page<AccountManagementVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         return page;
@@ -110,7 +99,7 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         //判断账户的别名是否已存在
         List<AccountManagement> accountManagements = this.list(Wrappers.<AccountManagement>lambdaQuery()
                 .eq(AccountManagement::getAlias, accountManagementDto.getAlias()));
-        if (accountManagements.size()>0){
+        if (accountManagements.size() > 0) {
             throw new ServiceException("数据错误：账户别名已存在请重新创建");
         }
         //添加账户管理表的信息
@@ -129,15 +118,15 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         //判断账户的别名是否已存在
         List<AccountManagement> accountManagements = this.list(Wrappers.<AccountManagement>lambdaQuery()
                 .eq(AccountManagement::getAlias, accountManagementDto.getAlias()));
-        if (accountManagements.size()>1){
+        if (accountManagements.size() > 1) {
             throw new ServiceException("数据错误：账户别名已存在请重新创建");
         }
         //删除账户-余额表的信息
         List<AccountRemainder> accountRemainderList = accountManagementDto.getAccountRemainderList();
         List<Long> ids = accountRemainderList.stream().map(accountRemainder -> accountRemainder.getId()).collect(Collectors.toList());
         accountRemainderService.remove(Wrappers.<AccountRemainder>lambdaQuery()
-                .eq(AccountRemainder::getAccountManagementId,accountManagementDto.getId())
-                .notIn(AccountRemainder::getId,ids)
+                .eq(AccountRemainder::getAccountManagementId, accountManagementDto.getId())
+                .notIn(AccountRemainder::getId, ids)
         );
         //添加账户余额表的信息
         saveAccountRemainder(accountManagementDto);
@@ -153,21 +142,21 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         List<AccountRunningWater> accountRunningWaterList = accountRunningWaterService.list(Wrappers.<AccountRunningWater>lambdaQuery()
                 .eq(AccountRunningWater::getAccountManagementId, id));
         //如果存在流水表的数据则不能删除账户表的信息
-        if (accountRunningWaterList.size()>0){
+        if (accountRunningWaterList.size() > 0) {
             throw new ServiceException("无法删除，该账户已存在流水数据");
         }
         //删除账户-管理表的信息
         this.removeById(id);
         //删除账户-余额表的信息
         accountRemainderService.remove(Wrappers.<AccountRemainder>lambdaQuery()
-                .eq(AccountRemainder::getAccountManagementId,id));
+                .eq(AccountRemainder::getAccountManagementId, id));
     }
 
     /**
      * 账户统计(账户列表)
      */
     @Override
-    public  List<Map<String, Object>> managementStatistics(AccountManagementSelectDto dto) {
+    public List<Map<String, Object>> managementStatistics(AccountManagementSelectDto dto) {
         //存放账户统计数据
         List<Map<String, Object>> list = new ArrayList<>();
 
@@ -182,24 +171,24 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         List<DictTenantDataVo> dictTenantDataVos = getDict("customer_source");
         DynamicDataSourceContextHolder.poll();
 
-        if (dictTenantDataVos.size()==0){
+        if (dictTenantDataVos.size() == 0) {
             throw new ServiceException("数据有误：没有配置币种字典，请先配置");
         }
 
         //赋值
         for (DictTenantDataVo dictTenantDataVo : dictTenantDataVos) {
             //赋初始值信息
-            Map<String,Object> map = new HashMap<>();
-            map.put("currencyKey",dictTenantDataVo.getDictKey());
-            map.put("currencyValue",dictTenantDataVo.getDictValue());
-            map.put("remainder",new BigDecimal(0));
+            Map<String, Object> map = new HashMap<>();
+            map.put("currencyKey", dictTenantDataVo.getDictKey());
+            map.put("currencyValue", dictTenantDataVo.getDictValue());
+            map.put("remainder", new BigDecimal(0));
             //赋值余额信息
-            if (accountRemainderList.size()>0){
+            if (accountRemainderList.size() > 0) {
                 Map<String, List<AccountRemainder>> accountRemainderMap = accountRemainderList.stream()
                         .collect(Collectors.groupingBy(AccountRemainder::getCurrency));
                 List<AccountRemainder> accountRemainderList1 = accountRemainderMap.get(dictTenantDataVo.getDictKey());
-                if (ObjectUtil.isNotEmpty(accountRemainderList1)){
-                    map.put("remainder",accountRemainderList1.get(0).getRemainder());
+                if (ObjectUtil.isNotEmpty(accountRemainderList1)) {
+                    map.put("remainder", accountRemainderList1.get(0).getRemainder());
                 }
             }
             list.add(map);
@@ -209,7 +198,7 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
     }
 
     //根据字典编码获取字典的数据
-    private List<DictTenantDataVo> getDict(String code){
+    private List<DictTenantDataVo> getDict(String code) {
         DictTenantDataSelectDto dto = new DictTenantDataSelectDto();
         dto.setDictCode(code);
         return dictTenantDataService.getList(dto);
@@ -316,7 +305,7 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
     /**
      * 添加账户-余额表的信息
      */
-    private void saveAccountRemainder(AccountManagementDto accountManagementDto){
+    private void saveAccountRemainder(AccountManagementDto accountManagementDto) {
         List<AccountRemainder> accountRemainderList = accountManagementDto.getAccountRemainderList();
         accountRemainderList.forEach(accountRemainder -> {
             accountRemainder.setAccountManagementId(accountManagementDto.getId());

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

@@ -25,9 +25,9 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.file.utils.ObsFileUtil;
-import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,9 +66,9 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
     @Override
     public Page<AccountPaymentVo> getPage(AccountRequestFundsSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()),"ap.status",dto.getPaymentStatus());
-        wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()),"ap.payment_remark",dto.getKeyword());
-        wrapper.orderByDesc("ap.status","ap.payment_time","ap.create_time");
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()), "ap.status", dto.getPaymentStatus());
+        wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()), "ap.payment_remark", dto.getKeyword());
+        wrapper.orderByDesc("ap.status", "ap.payment_time", "ap.create_time");
         Page<AccountPaymentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         //切换数据源
@@ -90,18 +90,18 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         List<AccountPaymentVo> records = page.getRecords();
         for (AccountPaymentVo record : records) {
             List<SysDept> sysDepts = sysDeptMap.get(record.getDepartmentId());
-            if (ObjectUtil.isNotEmpty(sysDepts)){
+            if (ObjectUtil.isNotEmpty(sysDepts)) {
                 record.setDeptName(sysDepts.get(0).getDeptName());
             }
             List<Corporation> corporations = corporationMap.get(record.getCorporationId());
-            if (ObjectUtil.isNotEmpty(corporations)){
+            if (ObjectUtil.isNotEmpty(corporations)) {
                 record.setCorporationName(corporations.get(0).getName());
             }
 
         }
 
         // 赋值用户名称
-        UserUtil.assignmentNickName(records, BasePo::getCreateUser,AccountPaymentVo::setUserName);
+        UserUtil.assignmentNickName(records, BasePo::getCreateUser, AccountPaymentVo::setUserName);
 
         return page;
     }
@@ -114,19 +114,19 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         AccountPayment AccountPayment = baseMapper.detail(id);
         AccountPaymentVo result = BeanUtil.toBean(AccountPayment, AccountPaymentVo.class);
 
-        if (ObjectUtil.isNotEmpty(result.getAccountManagementId())){
+        if (ObjectUtil.isNotEmpty(result.getAccountManagementId())) {
             //查询实际打款的付款账户名称；
             AccountManagement accountManagement = accountManagementService.getById(result.getAccountManagementId());
-            if (ObjectUtil.isNotEmpty(accountManagement)){
+            if (ObjectUtil.isNotEmpty(accountManagement)) {
                 result.setAccountManagementName(accountManagement.getName());
             }
 
         }
 
-        if (ObjectUtil.isNotEmpty(result.getBusinessManagementId())){
+        if (ObjectUtil.isNotEmpty(result.getBusinessManagementId())) {
             //查询业务中选中的付款账户名称；
             AccountManagement accountManagement = accountManagementService.getById(result.getBusinessManagementId());
-            if (ObjectUtil.isNotEmpty(accountManagement)){
+            if (ObjectUtil.isNotEmpty(accountManagement)) {
                 result.setBusinessManagementName(accountManagement.getName());
             }
 
@@ -136,6 +136,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
 
     /**
      * 打款功能
+     *
      * @param accountPaymentDto
      */
     @Override
@@ -145,26 +146,26 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
                 .eq(AccountRemainder::getAccountManagementId, accountPaymentDto.getAccountManagementId())
                 .eq(AccountRemainder::getCurrency, accountPaymentDto.getCurrency()));
         //如果不存在这条数据则返回账户余额不足
-        if (ObjectUtil.isEmpty(accountRemainder)){
+        if (ObjectUtil.isEmpty(accountRemainder)) {
             throw new ServiceException("账户余额不足");
         }
         //如果余额小于付款金额则返回账户余额不足
-        if (accountRemainder.getRemainder().compareTo(accountPaymentDto.getAmount()) == -1){
+        if (accountRemainder.getRemainder().compareTo(accountPaymentDto.getAmount()) == -1) {
             throw new ServiceException("账户余额不足");
         }
         //TODO 只要发起就是已打款（后期可能要修改）
         accountRemainder.setStatus(PaymentStatusEnum.REJECT.getKey());
-        if (ObjectUtil.isEmpty(accountPaymentDto.getId())){
+        if (ObjectUtil.isEmpty(accountPaymentDto.getId())) {
             this.save(accountPaymentDto);
-        }else {
+        } else {
             this.updateById(accountPaymentDto);
         }
 
         //添加附件信息
-        ObsFileUtil.saveFile(accountPaymentDto.getFileList(),accountPaymentDto.getId());
+        ObsFileUtil.saveFile(accountPaymentDto.getFileList(), accountPaymentDto.getId());
         accountRemainder.setChangeRemainder(accountPaymentDto.getAmount());
         //修改账户-余额表的中余额
-        accountRemainder.setRemainder( accountRemainder.getRemainder().subtract(accountPaymentDto.getAmount()));
+        accountRemainder.setRemainder(accountRemainder.getRemainder().subtract(accountPaymentDto.getAmount()));
         //打款的交易状态都是支出
         accountRemainder.setStatus("20");
         accountRemainderService.add(accountRemainder);
@@ -186,7 +187,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
     /**
      * 添加资金流水表的数据
      */
-    private void  addAccountRunningWater(AccountPaymentDto accountPaymentDto){
+    private void addAccountRunningWater(AccountPaymentDto accountPaymentDto) {
 
         AccountRunningWater accountRunningWater = new AccountRunningWater();
         accountRunningWater.setAccountManagementId(accountPaymentDto.getAccountManagementId());

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

@@ -1,17 +1,17 @@
 package com.fjhx.account.service.account.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.account.dto.AccountRemainderDto;
+import com.fjhx.account.entity.account.dto.AccountRemainderSelectDto;
 import com.fjhx.account.entity.account.po.AccountRemainder;
+import com.fjhx.account.entity.account.vo.AccountRemainderVo;
 import com.fjhx.account.mapper.account.AccountRemainderMapper;
 import com.fjhx.account.service.account.AccountRemainderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRemainderVo;
-import com.fjhx.account.entity.account.dto.AccountRemainderSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.account.entity.account.dto.AccountRemainderDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 
 /**
@@ -42,10 +42,10 @@ public class AccountRemainderServiceImpl extends ServiceImpl<AccountRemainderMap
 
     @Override
     public void add(AccountRemainder accountRemainderDto) {
-        synchronized (this){
-            if (ObjectUtil.isNotEmpty(accountRemainderDto.getId())){
+        synchronized (this) {
+            if (ObjectUtil.isNotEmpty(accountRemainderDto.getId())) {
                 this.updateById(accountRemainderDto);
-            }else {
+            } else {
                 this.save(accountRemainderDto);
             }
         }

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

@@ -1,23 +1,23 @@
 package com.fjhx.account.service.account.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailDto;
+import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailSelectDto;
 import com.fjhx.account.entity.account.po.AccountRequestFundsDetail;
+import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
 import com.fjhx.account.mapper.account.AccountRequestFundsDetailMapper;
 import com.fjhx.account.service.account.AccountRequestFundsDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailSelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.account.entity.account.dto.AccountRequestFundsDetailDto;
-import cn.hutool.core.bean.BeanUtil;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author
@@ -58,6 +58,7 @@ public class AccountRequestFundsDetailServiceImpl extends ServiceImpl<AccountReq
 
     /**
      * 获取列表根据合同ID
+     *
      * @param contractId
      * @return
      */

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

@@ -19,12 +19,10 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.flow.entity.flow.po.FlowExample;
-import com.fjhx.flow.entity.flow.po.FlowInfo;
 import com.fjhx.flow.service.flow.FlowExampleService;
-import com.fjhx.flow.service.flow.FlowInfoService;
-import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
@@ -63,21 +61,22 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
 
     /**
      * 查询请款列表
+     *
      * @param dto
      * @return
      */
     @Override
     public Page<AccountRequestFundsVo> getPage(AccountRequestFundsSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()),"arf.type",dto.getType());
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()),"arf.status",dto.getStatus());
-        wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()),"ap.status",dto.getPaymentStatus());
-        wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()),"arf.payment_remarks",dto.getKeyword());
-        wrapper.orderByDesc("ap.status","arf.payment_time","arf.create_time");
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getType()), "arf.type", dto.getType());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getStatus()), "arf.status", dto.getStatus());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getPaymentStatus()), "ap.status", dto.getPaymentStatus());
+        wrapper.like(ObjectUtil.isNotEmpty(dto.getKeyword()), "arf.payment_remarks", dto.getKeyword());
+        wrapper.orderByDesc("ap.status", "arf.payment_time", "arf.create_time");
         Page<AccountRequestFundsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         //赋值部门名称、归属公司名称
         List<AccountRequestFundsVo> records = page.getRecords();
-        if(ObjectUtil.isEmpty(records)){
+        if (ObjectUtil.isEmpty(records)) {
             return page;
         }
 
@@ -104,37 +103,38 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         for (AccountRequestFundsVo record : records) {
             //赋值部门信息
             List<SysDept> sysDepts = sysDeptMap.get(record.getDepartmentId());
-            if (ObjectUtil.isNotEmpty(sysDepts)){
+            if (ObjectUtil.isNotEmpty(sysDepts)) {
                 record.setDeptName(sysDepts.get(0).getDeptName());
             }
 
             //赋值公司信息
             List<Corporation> corporations = corporationMap.get(record.getCorporationId());
-            if (ObjectUtil.isNotEmpty(corporations)){
+            if (ObjectUtil.isNotEmpty(corporations)) {
                 record.setCorporationName(corporations.get(0).getName());
             }
 
             //赋值流程ID
             List<FlowExample> flowInfoList = flowInfoMap.get(record.getId());
-            if (ObjectUtil.isEmpty(flowInfoList)){
+            if (ObjectUtil.isEmpty(flowInfoList)) {
                 throw new ServiceException("数据有误：该请款没有找到流程详情信息信息");
             }
             record.setFlowInfoId(flowInfoList.get(0).getId());
         }
 
         // 赋值用户名称
-        UserUtil.assignmentNickName(records, BasePo::getCreateUser,AccountRequestFundsVo::setUserName);
+        UserUtil.assignmentNickName(records, BasePo::getCreateUser, AccountRequestFundsVo::setUserName);
         DynamicDataSourceContextHolder.poll();
         return page;
     }
 
     /**
      * 查询请款详情
+     *
      * @param id
      * @return
      */
     @Override
-    public AccountRequestFundsVo detail(Long id){
+    public AccountRequestFundsVo detail(Long id) {
         AccountRequestFunds accountRequestFunds = this.getById(id);
         AccountRequestFundsVo accountRequestFundsVo = BeanUtil.toBean(accountRequestFunds, AccountRequestFundsVo.class);
 
@@ -148,7 +148,7 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         DynamicDataSourceContextHolder.push(SourceConstant.COMMON);
         //查询归属公司的名称
         Corporation corporation = corporationService.getById(accountRequestFundsVo.getCorporationId());
-        if (ObjectUtil.isEmpty(corporation)){
+        if (ObjectUtil.isEmpty(corporation)) {
             throw new ServiceException("没有找到归属公司信息");
         }
         accountRequestFundsVo.setCorporationName(corporation.getName());
@@ -157,7 +157,7 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         //查询部门名称信息
         SysDept sysDept = sysDeptService.getById(accountRequestFundsVo.getDepartmentId());
-        if (ObjectUtil.isEmpty(sysDept)){
+        if (ObjectUtil.isEmpty(sysDept)) {
             throw new ServiceException("没有找到归属部门信息");
         }
         accountRequestFundsVo.setDeptName(sysDept.getDeptName());

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

@@ -23,8 +23,8 @@ import com.fjhx.item.util.excel.util.ExcelUtil;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
-import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,7 +54,6 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     private DictTenantDataService dictTenantDataService;
 
 
-
     @Override
     public Page<AccountRunningWaterVo> getPage(AccountRunningWaterSelectDto dto) {
         QueryWrapper<Object> wrapper = Wrappers.query();
@@ -69,23 +68,23 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         //是否认领
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getIsClaim()), "arw.is_claim", dto.getIsClaim());
         //交易开始金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()),"arw.amount",dto.getBeginAmount());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()), "arw.amount", dto.getBeginAmount());
         //交易结束金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndAmount()),"arw.amount",dto.getEndAmount());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndAmount()), "arw.amount", dto.getEndAmount());
         //交易开始时间
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()),"arw.create_time",dto.getBeginTime());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "arw.create_time", dto.getBeginTime());
         //交易结束金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndTime()),"arw.create_time",dto.getEndTime());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndTime()), "arw.create_time", dto.getEndTime());
         //对方账户名称
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getName()),"arw.name",dto.getName());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getName()), "arw.name", dto.getName());
         //摘要
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getRemarks()),"arw.name",dto.getRemarks());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getRemarks()), "arw.name", dto.getRemarks());
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
         }
-        if(ObjectUtil.isNotEmpty(dto.getDataType())&&dto.getDataType()==1){//到账认领数据
-            wrapper.eq("arw.received",10);
-            wrapper.orderByAsc("arw.is_claim","arw.create_time");
+        if (ObjectUtil.isNotEmpty(dto.getDataType()) && dto.getDataType() == 1) {//到账认领数据
+            wrapper.eq("arw.received", 10);
+            wrapper.orderByAsc("arw.is_claim", "arw.create_time");
         }
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
@@ -96,6 +95,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         AccountRunningWaterVo result = baseMapper.getDetail(id);
         return result;
     }
+
     /**
      * 账户资金流水表新增
      */
@@ -105,23 +105,23 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
 
         //修改账户余额表的余额
         AccountRemainder accountRemainder = accountRemainderService.getOne(Wrappers.<AccountRemainder>lambdaQuery()
-                .eq(AccountRemainder::getAccountManagementId,accountRunningWaterDto.getAccountManagementId())
-                .eq(AccountRemainder::getCurrency,accountRunningWaterDto.getCurrency())
+                .eq(AccountRemainder::getAccountManagementId, accountRunningWaterDto.getAccountManagementId())
+                .eq(AccountRemainder::getCurrency, accountRunningWaterDto.getCurrency())
         );
-        if (ObjectUtil.isEmpty(accountRemainder)){
+        if (ObjectUtil.isEmpty(accountRemainder)) {
             throw new ServiceException("账户余额不足");
         }
         accountRemainder.setStatus(accountRunningWaterDto.getStatus());
         //修改变更余额
         accountRemainder.setChangeRemainder(accountRunningWaterDto.getAmount());
-        if (accountRunningWaterDto.getStatus().equals("10")){
+        if (accountRunningWaterDto.getStatus().equals("10")) {
             accountRemainder.setRemainder(accountRemainder.getRemainder().add(accountRunningWaterDto.getAmount()));
-        }else if (accountRunningWaterDto.getStatus().equals("20")){
-           if (accountRemainder.getRemainder().compareTo(accountRunningWaterDto.getAmount()) ==-1){
-               throw new ServiceException("账户余额不足");
-           }else {
-               accountRemainder.setRemainder(accountRemainder.getRemainder().subtract(accountRunningWaterDto.getAmount()));
-           }
+        } else if (accountRunningWaterDto.getStatus().equals("20")) {
+            if (accountRemainder.getRemainder().compareTo(accountRunningWaterDto.getAmount()) == -1) {
+                throw new ServiceException("账户余额不足");
+            } else {
+                accountRemainder.setRemainder(accountRemainder.getRemainder().subtract(accountRunningWaterDto.getAmount()));
+            }
         }
         accountRemainderService.updateById(accountRemainder);
         this.save(accountRunningWaterDto);
@@ -253,8 +253,8 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         QueryWrapper<AccountRunningWater> query = Wrappers.query();
         query.groupBy("is_claim");
         query.select("is_claim,count(*) count");
-       //到账认领统计
-       return baseMapper.selectList(query);
+        //到账认领统计
+        return baseMapper.selectList(query);
 
     }
 
@@ -272,30 +272,30 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         //是否认领
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getIsClaim()), "arw.is_claim", dto.getIsClaim());
         //交易开始金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()),"arw.amount",dto.getBeginAmount());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginAmount()), "arw.amount", dto.getBeginAmount());
         //交易结束金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndAmount()),"arw.amount",dto.getEndAmount());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndAmount()), "arw.amount", dto.getEndAmount());
         //交易开始时间
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()),"arw.create_time",dto.getBeginTime());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getBeginTime()), "arw.create_time", dto.getBeginTime());
         //交易结束金额
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndTime()),"arw.create_time",dto.getEndTime());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getEndTime()), "arw.create_time", dto.getEndTime());
         //对方账户名称
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getName()),"arw.name",dto.getName());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getName()), "arw.name", dto.getName());
         //摘要
-        wrapper.ge(ObjectUtil.isNotEmpty(dto.getRemarks()),"arw.name",dto.getRemarks());
+        wrapper.ge(ObjectUtil.isNotEmpty(dto.getRemarks()), "arw.name", dto.getRemarks());
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.and(wrapper1 -> wrapper1.like("arw.remarks", dto.getKeyword()).or().like("arw.name", dto.getKeyword()));
         }
-        if(ObjectUtil.isNotEmpty(dto.getDataType())&&dto.getDataType()==1){//到账认领数据
-            wrapper.eq("arw.received",10);
-            wrapper.orderByAsc("arw.is_claim","arw.create_time");
+        if (ObjectUtil.isNotEmpty(dto.getDataType()) && dto.getDataType() == 1) {//到账认领数据
+            wrapper.eq("arw.received", 10);
+            wrapper.orderByAsc("arw.is_claim", "arw.create_time");
         }
         List<AccountRunningWaterVo> records = this.baseMapper.getList(wrapper);
 
         //赋值字典数据
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);
         List<DictTenantDataVo> dictTenantDataVos = getDict("account_currency");
-        if (dictTenantDataVos.size() == 0){
+        if (dictTenantDataVos.size() == 0) {
             throw new ServiceException("数据有误：没有配置币种字典，请先配置");
         }
         Map<String, List<DictTenantDataVo>> dictTenantDataVoMap = dictTenantDataVos.stream()
@@ -303,7 +303,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         DynamicDataSourceContextHolder.poll();
         for (AccountRunningWaterVo accountRunningWaterVo : records) {
             List<DictTenantDataVo> dictTenantDataVoList = dictTenantDataVoMap.get(accountRunningWaterVo.getCurrency());
-            if (ObjectUtil.isNotEmpty(dictTenantDataVoList)){
+            if (ObjectUtil.isNotEmpty(dictTenantDataVoList)) {
                 accountRunningWaterVo.setCurrency(dictTenantDataVoList.get(0).getDictValue());
             }
         }

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

@@ -22,7 +22,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 

hx-admin/src/test/java/SqlTest.java

@@ -0,0 +1,57 @@
+import cn.hutool.db.Db;
+import cn.hutool.db.Entity;
+import cn.hutool.db.ds.simple.SimpleDataSource;
+import lombok.SneakyThrows;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.List;
+
+public class SqlTest {
+
+    static String url = "jdbc:mysql://127.0.0.1:3306/fly4.0?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true";
+    static String user = "root";
+    static String pass = "root";
+
+    static DataSource dataSource = new SimpleDataSource(url, user, pass);
+    static Db db = new Db(dataSource);
+
+    @SneakyThrows
+    public static void main(String[] args) {
+        // 查询所有数据库
+        List<Entity> showDatabases = db.query("SHOW DATABASES");
+        // 循环数据库
+        for (Entity showDatabase : showDatabases) {
+            // 并找出以bytesailing_开头的数据库
+            String database = showDatabase.getStr("database");
+            if (database.startsWith("bytesailing_")) {
+                // 删除指定数据库中所有表中的tenant_id不等于wdly的数据
+                deleteTenantId(database);
+            }
+        }
+    }
+
+    /**
+     * 查询指定库中所有表，并找出包含tenant_id字段的表，删除表中tenant_id不等于wdly的数据
+     */
+    private static void deleteTenantId(String database) throws SQLException {
+        // 查询指定库中所有表
+        List<Entity> tables = db.query("SHOW TABLES FROM " + database);
+        for (Entity table : tables) {
+            // 获取表名
+            String tableName = table.getStr("tables_in_" + database);
+            // 查询表中是否包含tenant_id字段
+            List<Entity> columns = db.query("SELECT column_name " +
+                    "FROM information_schema.columns " +
+                    "WHERE table_schema = '" + database + "' " +
+                    "AND table_name = '" + tableName + "' " +
+                    "AND column_name = 'tenant_id' ");
+            // 删除表中tenant_id不等于wdly的数据
+            if (!columns.isEmpty()) {
+                String sql = "DELETE FROM " + database + "." + tableName + " WHERE tenant_id != 'wdly'";
+                db.execute(sql);
+            }
+        }
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java

@@ -2,7 +2,7 @@ package com.fjhx.common.constant;
 
 
 public interface SourceConstant {
-    
+
     String ITEM = "item";
 
     String SUPPLY = "supply";

hx-common/src/main/java/com/fjhx/common/controller/coding/CodingRuleController.java

@@ -1,13 +1,15 @@
 package com.fjhx.common.controller.coding;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.coding.vo.CodingRulePageVo;
-import com.fjhx.common.entity.coding.dto.CodingRuleSelectDto;
 import com.fjhx.common.entity.coding.dto.CodingRuleDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.common.entity.coding.dto.CodingRuleSelectDto;
+import com.fjhx.common.entity.coding.vo.CodingRulePageVo;
 import com.fjhx.common.service.coding.CodingRuleService;
 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;
 
 
 /**
@@ -15,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 编码规则 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-13
  */
 @RestController

hx-common/src/main/java/com/fjhx/common/controller/corporation/CorporationController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * 多公司配置 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 @RestController

hx-common/src/main/java/com/fjhx/common/controller/documentary/DocumentaryController.java

@@ -1,13 +1,16 @@
 package com.fjhx.common.controller.documentary;
 
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.documentary.vo.DocumentaryVo;
-import com.fjhx.common.entity.documentary.dto.DocumentarySelectDto;
 import com.fjhx.common.entity.documentary.dto.DocumentaryDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.common.entity.documentary.dto.DocumentarySelectDto;
+import com.fjhx.common.entity.documentary.vo.DocumentaryVo;
 import com.fjhx.common.service.documentary.DocumentaryService;
+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;
 
 
 /**
@@ -15,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 跟单配置 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @RestController

hx-common/src/main/java/com/fjhx/common/controller/multilingual/MultilingualController.java

@@ -9,7 +9,11 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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;
 
 @RestController
 @RequestMapping("/open/multilingual")

hx-common/src/main/java/com/fjhx/common/controller/problem/ProblemFeedbackController.java

@@ -1,14 +1,17 @@
 package com.fjhx.common.controller.problem;
 
-import com.ruoyi.common.annotation.TenantIgnore;
-import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
-import com.fjhx.common.entity.problem.dto.ProblemFeedbackSelectDto;
 import com.fjhx.common.entity.problem.dto.ProblemFeedbackDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.common.entity.problem.dto.ProblemFeedbackSelectDto;
+import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
 import com.fjhx.common.service.problem.ProblemFeedbackService;
+import com.ruoyi.common.annotation.TenantIgnore;
+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;
 
 
 /**
@@ -16,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 问题反馈 前端控制器
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-04
  */
 @RestController

hx-common/src/main/java/com/fjhx/common/entity/coding/dto/CodingRuleDto.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 编码规则新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-13
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/coding/dto/CodingRuleSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 编码规则列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-13
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/coding/po/CodingRule.java

@@ -10,7 +10,7 @@ import lombok.Setter;
  * 编码规则
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-13
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/coding/po/CodingRuleAuto.java

@@ -1,9 +1,8 @@
 package com.fjhx.common.entity.coding.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +11,7 @@ import lombok.Setter;
  * 规则配置自增编码
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-18
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/contract/dto/ContractTemplateDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 合同模板新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-14
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/contract/dto/ContractTemplateSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 合同模板列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-14
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/contract/vo/ContractTemplateVo.java

@@ -25,5 +25,4 @@ public class ContractTemplateVo extends ContractTemplate {
     private String corporationNumber;
 
 
-
 }

hx-common/src/main/java/com/fjhx/common/entity/corporation/dto/CorporationSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 多公司配置列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/corporation/po/Corporation.java

@@ -1,9 +1,7 @@
 package com.fjhx.common.entity.corporation.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 

hx-common/src/main/java/com/fjhx/common/entity/corporation/vo/CorporationVo.java

@@ -1,6 +1,5 @@
 package com.fjhx.common.entity.corporation.vo;
 
-import com.fjhx.area.service.ISetAreaName;
 import com.fjhx.area.service.SetCustomizeAreaName;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import lombok.Getter;
@@ -9,7 +8,7 @@ import lombok.Setter;
 /**
  * 多公司配置列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/documentary/dto/DocumentaryDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 跟单配置新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/documentary/dto/DocumentarySelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 跟单配置列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/documentary/eums/DocumentaryTypeEnum.java

@@ -17,29 +17,27 @@ public enum DocumentaryTypeEnum {
 
     purchase(2, "采购跟单", "purchaseServiceImpl");
 
+    private final static Map<Integer, DocumentaryTypeEnum> map = new HashMap<>();
+
+    static {
+        for (DocumentaryTypeEnum value : DocumentaryTypeEnum.values()) {
+            map.put(value.key, value);
+        }
+    }
+
     /**
      * 跟单类型
      */
     private final Integer key;
-
     /**
      * 类型名称
      */
     private final String name;
-
     /**
      * 实现bean名称
      */
     private final String beanName;
 
-    private final static Map<Integer, DocumentaryTypeEnum> map = new HashMap<>();
-
-    static {
-        for (DocumentaryTypeEnum value : DocumentaryTypeEnum.values()) {
-            map.put(value.key, value);
-        }
-    }
-
     public static DocumentaryTypeEnum getEnum(Integer key) {
         return map.computeIfAbsent(key, item -> {
             throw new ServiceException("未知跟单类型");

hx-common/src/main/java/com/fjhx/common/entity/documentary/po/Documentary.java

@@ -2,7 +2,6 @@ package com.fjhx.common.entity.documentary.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,7 +10,7 @@ import lombok.Setter;
  * 跟单配置
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/problem/dto/ProblemFeedbackDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 问题反馈新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-05-04
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/problem/dto/ProblemFeedbackSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 问题反馈列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-05-04
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/problem/vo/ProblemFeedbackVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 问题反馈列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-05-04
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/send/dto/SendMegDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 新增编辑入参实体
  *
- * @author 
+ * @author
  * @since 2023-05-22
  */
 @Getter
@@ -15,5 +15,4 @@ import lombok.Setter;
 public class SendMegDto extends SendMeg {
 
 
-
 }

hx-common/src/main/java/com/fjhx/common/entity/send/dto/SendMegSelectDto.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-05-22
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/entity/send/vo/SendMegVo.java

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-05-22
  */
 @Getter

hx-common/src/main/java/com/fjhx/common/enums/CodingRuleEnum.java

@@ -118,29 +118,27 @@ public enum CodingRuleEnum {
     )),
     ;
 
+    private static final Map<String, CodingRuleEnum> map = new HashMap<>();
+
+    static {
+        for (CodingRuleEnum value : CodingRuleEnum.values()) {
+            map.put(value.key, value);
+        }
+    }
+
     /**
      * 编码规则key
      */
     private final String key;
-
     /**
      * 功能名称
      */
     private final String name;
-
     /**
      * 默认规则
      */
     private final List<DefaultRule> defaultRuleList;
 
-    private static final Map<String, CodingRuleEnum> map = new HashMap<>();
-
-    static {
-        for (CodingRuleEnum value : CodingRuleEnum.values()) {
-            map.put(value.key, value);
-        }
-    }
-
     private static DefaultRule getDefaultRule(RuleTypeEnum ruleTypeEnum) {
         return new DefaultRule(ruleTypeEnum);
     }
@@ -149,6 +147,14 @@ public enum CodingRuleEnum {
         return new DefaultRule(ruleTypeEnum, value);
     }
 
+    public static List<RuleVo> getDefaultRuleVoList(String key) {
+        CodingRuleEnum codingRuleEnum = map.get(key);
+        if (codingRuleEnum == null) {
+            throw new ServiceException("编码规则key不存在");
+        }
+        return codingRuleEnum.getDefaultRuleVoList();
+    }
+
     public List<RuleVo> getDefaultRuleVoList() {
         return defaultRuleList.stream().map(item -> {
             RuleVo ruleVo = new RuleVo();
@@ -158,12 +164,4 @@ public enum CodingRuleEnum {
         }).collect(Collectors.toList());
     }
 
-    public static List<RuleVo> getDefaultRuleVoList(String key) {
-        CodingRuleEnum codingRuleEnum = map.get(key);
-        if (codingRuleEnum == null) {
-            throw new ServiceException("编码规则key不存在");
-        }
-        return codingRuleEnum.getDefaultRuleVoList();
-    }
-
 }

hx-common/src/main/java/com/fjhx/common/enums/FlowStatusEnum1.java

@@ -12,16 +12,14 @@ public enum FlowStatusEnum1 {
     DRAFT(0, "草稿"),
     UNDER_REVIEW(10, "审批中"),
     REJECT(20, "驳回"),
-    PASS(30,"通过"),
-    CANCELLATION(88,"作废"),
-    TERMINATION(99,"终止"),
+    PASS(30, "通过"),
+    CANCELLATION(88, "作废"),
+    TERMINATION(99, "终止"),
     ;
+    private static Map<Integer, String> map = new LinkedHashMap<>();
     private int key;
-
     private String value;
 
-    private static Map<Integer, String> map = new LinkedHashMap<>();
-
     FlowStatusEnum1(int key, String value) {
         this.key = key;
         this.value = value;

hx-common/src/main/java/com/fjhx/common/enums/RuleTypeEnum.java

@@ -18,10 +18,6 @@ public enum RuleTypeEnum {
     AUTOINCREMENT(5, "自增编号"),
     DATE_FORMAT(6, "日期");
 
-    private final Integer type;
-
-    private final String name;
-
     private static final Map<Integer, RuleTypeEnum> map = new HashMap<>();
 
     static {
@@ -30,6 +26,9 @@ public enum RuleTypeEnum {
         }
     }
 
+    private final Integer type;
+    private final String name;
+
     public static RuleTypeEnum getRuleTypeEnum(Integer type) {
         RuleTypeEnum ruleTypeEnum = map.get(type);
         if (ruleTypeEnum == null) {

hx-common/src/main/java/com/fjhx/common/mapper/coding/CodingRuleAutoMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.common.mapper.coding;
 
-import com.fjhx.common.entity.coding.po.CodingRuleAuto;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.common.entity.coding.po.CodingRuleAuto;
 
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 规则配置自增编码 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-18
  */
 public interface CodingRuleAutoMapper extends BaseMapper<CodingRuleAuto> {

hx-common/src/main/java/com/fjhx/common/mapper/contract/ContractTemplateMapper.java

@@ -1,8 +1,8 @@
 package com.fjhx.common.mapper.contract;
 
-import com.fjhx.common.entity.contract.po.ContractTemplate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contract.po.ContractTemplate;
 import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * 合同模板 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-14
  */
 public interface ContractTemplateMapper extends BaseMapper<ContractTemplate> {

hx-common/src/main/java/com/fjhx/common/mapper/corporation/CorporationMapper.java

@@ -1,8 +1,8 @@
 package com.fjhx.common.mapper.corporation;
 
-import com.fjhx.common.entity.corporation.po.Corporation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.entity.corporation.vo.CorporationVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * 多公司配置 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-10
  */
 public interface CorporationMapper extends BaseMapper<Corporation> {

hx-common/src/main/java/com/fjhx/common/mapper/documentary/DocumentaryMapper.java

@@ -1,8 +1,8 @@
 package com.fjhx.common.mapper.documentary;
 
-import com.fjhx.common.entity.documentary.po.Documentary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.documentary.po.Documentary;
 import com.fjhx.common.entity.documentary.vo.DocumentaryVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * 跟单配置 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-19
  */
 public interface DocumentaryMapper extends BaseMapper<Documentary> {

hx-common/src/main/java/com/fjhx/common/mapper/documentary/DocumentaryRecordMapper.java

@@ -1,11 +1,7 @@
 package com.fjhx.common.mapper.documentary;
 
-import com.fjhx.common.entity.documentary.po.DocumentaryRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.documentary.vo.DocumentaryRecordVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.apache.ibatis.annotations.Param;
+import com.fjhx.common.entity.documentary.po.DocumentaryRecord;
 
 
 /**
@@ -13,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
  * 跟单记录 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-20
  */
 public interface DocumentaryRecordMapper extends BaseMapper<DocumentaryRecord> {

hx-common/src/main/java/com/fjhx/common/mapper/problem/ProblemFeedbackMapper.java

@@ -1,8 +1,8 @@
 package com.fjhx.common.mapper.problem;
 
-import com.fjhx.common.entity.problem.po.ProblemFeedback;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.problem.po.ProblemFeedback;
 import com.fjhx.common.entity.problem.vo.ProblemFeedbackVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
  * 问题反馈 Mapper 接口
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-04
  */
 public interface ProblemFeedbackMapper extends BaseMapper<ProblemFeedback> {

hx-common/src/main/java/com/fjhx/common/service/coding/CodingRuleAutoService.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.service.BaseService;
  * 规则配置自增编码 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-18
  */
 public interface CodingRuleAutoService extends BaseService<CodingRuleAuto> {

hx-common/src/main/java/com/fjhx/common/service/coding/impl/CodingRuleAutoServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.common.service.coding.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.entity.coding.po.CodingRuleAuto;
 import com.fjhx.common.mapper.coding.CodingRuleAutoMapper;
 import com.fjhx.common.service.coding.CodingRuleAutoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * 规则配置自增编码 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-05-18
  */
 @Service

hx-common/src/main/java/com/fjhx/common/service/coding/impl/CodingRuleServiceImpl.java

@@ -21,9 +21,9 @@ import com.fjhx.common.mapper.coding.CodingRuleMapper;
 import com.fjhx.common.service.coding.CodingRuleAutoService;
 import com.fjhx.common.service.coding.CodingRuleCustomerService;
 import com.fjhx.common.service.coding.CodingRuleService;
-import com.obs.services.internal.ServiceException;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
@@ -59,6 +59,18 @@ public class CodingRuleServiceImpl extends ServiceImpl<CodingRuleMapper, CodingR
     @Autowired
     private CodingRuleAutoService codingRuleAutoService;
 
+    /**
+     * 不够位数的在前面补0，保留num的长度位数字
+     */
+    private static String autoGenericCode(Object length, Integer codeNum) {
+        Integer integer = Convert.toInt(length);
+        if (integer == null) {
+            throw new ServiceException("自定义编码长度不为数字");
+        }
+
+        return String.format("%0" + integer + "d", codeNum + 1);
+    }
+
     @Override
     public Page<CodingRulePageVo> getPage(CodingRuleSelectDto dto) {
 
@@ -207,7 +219,6 @@ public class CodingRuleServiceImpl extends ServiceImpl<CodingRuleMapper, CodingR
         return codingRuleAuto.getNum();
     }
 
-
     private int getTempIndex(int startIndex, int endIndex, int tempIndex,
                              List<CodingRulePageVo> codingRulePageVoList,
                              List<String> keyList,
@@ -250,7 +261,6 @@ public class CodingRuleServiceImpl extends ServiceImpl<CodingRuleMapper, CodingR
         return customizeArea.getCode();
     }
 
-
     /**
      * 获取业务员编码
      */
@@ -263,16 +273,4 @@ public class CodingRuleServiceImpl extends ServiceImpl<CodingRuleMapper, CodingR
         return userCode;
     }
 
-    /**
-     * 不够位数的在前面补0，保留num的长度位数字
-     */
-    private static String autoGenericCode(Object length, Integer codeNum) {
-        Integer integer = Convert.toInt(length);
-        if (integer == null) {
-            throw new ServiceException("自定义编码长度不为数字");
-        }
-
-        return String.format("%0" + integer + "d", codeNum + 1);
-    }
-
 }

hx-common/src/main/java/com/fjhx/common/service/contract/ContractTemplateService.java

@@ -1,11 +1,11 @@
 package com.fjhx.common.service.contract;
 
-import com.fjhx.common.entity.contract.po.ContractTemplate;
-import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
-import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
 import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
+import com.fjhx.common.entity.contract.dto.ContractTemplateSelectDto;
+import com.fjhx.common.entity.contract.po.ContractTemplate;
+import com.fjhx.common.entity.contract.vo.ContractTemplateVo;
+import com.ruoyi.common.core.service.BaseService;
 
 
 /**
@@ -13,7 +13,7 @@ import com.fjhx.common.entity.contract.dto.ContractTemplateDto;
  * 合同模板 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-14
  */
 public interface ContractTemplateService extends BaseService<ContractTemplate> {