Merge remote-tracking branch 'origin/master'

code/src/test/java/AccountDataSource.java

@@ -4,9 +4,9 @@ public class AccountDataSource {
 
     public static void main(String[] args) {
         GeneratorApplication.builder()
-                .url("jdbc:mysql://36.134.91.96:12333/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
-                .username("root")
-                .password("Fjhx@pwd123")
+                .url(DataSourceInfo.URL)
+                .username(DataSourceInfo.USER_NAME)
+                .password(DataSourceInfo.PASSWORD)
                 .port(9989)
                 .module("hx-account")
                 .parent("com.fjhx.account")

code/src/test/java/CommonDataSource.java

@@ -4,9 +4,9 @@ public class CommonDataSource {
 
     public static void main(String[] args) {
         GeneratorApplication.builder()
-                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
-                .username("fjhx2012mysql")
-                .password("3PN-Mzn#vnP&q6d")
+                .url(DataSourceInfo.URL)
+                .username(DataSourceInfo.USER_NAME)
+                .password(DataSourceInfo.PASSWORD)
                 .port(9989)
                 .module("hx-common")
                 .parent("com.fjhx.common")

code/src/test/java/SupplyDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class SupplyDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url(DataSourceInfo.URL)
+                .username(DataSourceInfo.USER_NAME)
+                .password(DataSourceInfo.PASSWORD)
+                .port(9989)
+                .module("hx-supply")
+                .parent("com.fjhx.supply")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

hx-account/pom.xml

@@ -26,6 +26,10 @@
             <groupId>com.fjhx</groupId>
             <artifactId>hx-item</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-wms</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -1,13 +1,11 @@
 package com.fjhx.account.controller.account;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.account.entity.account.dto.AccountRunningWaterDto;
 import com.fjhx.account.entity.account.dto.AccountRunningWaterSelectDto;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.service.account.AccountRunningWaterService;
-import com.fjhx.common.constant.SourceConstant;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -52,6 +50,7 @@ public class AccountRunningWaterController {
         return accountRunningWaterService.getPage1(dto);
     }
 
+
     /**
      * 账户资金流水表明细
      */

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

@@ -0,0 +1,79 @@
+package com.fjhx.account.controller.account;
+
+import com.fjhx.account.entity.account.dto.AccountSubjectsDto;
+import com.fjhx.account.entity.account.dto.AccountSubjectsSelectDto;
+import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
+import com.fjhx.account.service.account.AccountSubjectsService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记账科目 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@RestController
+@RequestMapping("/accountSubjects")
+public class AccountSubjectsController {
+
+    @Autowired
+    private AccountSubjectsService accountSubjectsService;
+
+    /**
+     * 记账科目列表
+     */
+    @PostMapping("/list")
+    public List<AccountSubjectsVo> list(@RequestBody AccountSubjectsSelectDto dto) {
+        return accountSubjectsService.getList(dto);
+    }
+
+//    /**
+//     * 记账科目分页
+//     */
+//    @PostMapping("/page")
+//    public Page<AccountSubjectsVo> page(@RequestBody AccountSubjectsSelectDto dto) {
+//        return accountSubjectsService.getPage(dto);
+//    }
+//
+//    /**
+//     * 记账科目明细
+//     */
+//    @PostMapping("/detail")
+//    public AccountSubjectsVo detail(@RequestBody BaseSelectDto dto) {
+//        return accountSubjectsService.detail(dto.getId());
+//    }
+
+    /**
+     * 记账科目新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AccountSubjectsDto accountSubjectsDto) {
+        accountSubjectsService.add(accountSubjectsDto);
+    }
+
+    /**
+     * 记账科目编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AccountSubjectsDto accountSubjectsDto) {
+        accountSubjectsService.edit(accountSubjectsDto);
+    }
+
+    /**
+     * 记账科目删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        accountSubjectsService.delete(dto.getId());
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/controller/calculate/CalculateItemController.java

@@ -0,0 +1,20 @@
+package com.fjhx.account.controller.calculate;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 核算项目 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-25
+ */
+@RestController
+@RequestMapping("/calculateItem")
+public class CalculateItemController {
+
+
+}

hx-account/src/main/java/com/fjhx/account/controller/payee/PayeeInfoController.java

@@ -0,0 +1,71 @@
+package com.fjhx.account.controller.payee;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.payee.dto.PayeeInfoDto;
+import com.fjhx.account.entity.payee.dto.PayeeInfoSelectDto;
+import com.fjhx.account.entity.payee.vo.PayeeInfoVo;
+import com.fjhx.account.service.payee.PayeeInfoService;
+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
+ * @since 2024-03-20
+ */
+@RestController
+@RequestMapping("/payeeInfo")
+public class PayeeInfoController {
+
+    @Autowired
+    private PayeeInfoService payeeInfoService;
+
+    /**
+     * 收款单位分页
+     */
+    @PostMapping("/page")
+    public Page<PayeeInfoVo> page(@RequestBody PayeeInfoSelectDto dto) {
+        return payeeInfoService.getPage(dto);
+    }
+
+    /**
+     * 收款单位明细
+     */
+    @PostMapping("/detail")
+    public PayeeInfoVo detail(@RequestBody BaseSelectDto dto) {
+        return payeeInfoService.detail(dto.getId());
+    }
+
+    /**
+     * 收款单位新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PayeeInfoDto payeeInfoDto) {
+        payeeInfoService.add(payeeInfoDto);
+    }
+
+    /**
+     * 收款单位编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PayeeInfoDto payeeInfoDto) {
+        payeeInfoService.edit(payeeInfoDto);
+    }
+
+    /**
+     * 收款单位删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        payeeInfoService.delete(dto.getId());
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/controller/payment/PaymentTypeController.java

@@ -0,0 +1,71 @@
+package com.fjhx.account.controller.payment;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.payment.dto.PaymentTypeDto;
+import com.fjhx.account.entity.payment.dto.PaymentTypeSelectDto;
+import com.fjhx.account.entity.payment.vo.PaymentTypeVo;
+import com.fjhx.account.service.payment.PaymentTypeService;
+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
+ * @since 2024-03-18
+ */
+@RestController
+@RequestMapping("/paymentType")
+public class PaymentTypeController {
+
+    @Autowired
+    private PaymentTypeService paymentTypeService;
+
+    /**
+     * 收付款类型分页
+     */
+    @PostMapping("/page")
+    public Page<PaymentTypeVo> page(@RequestBody PaymentTypeSelectDto dto) {
+        return paymentTypeService.getPage(dto);
+    }
+
+    /**
+     * 收付款类型明细
+     */
+    @PostMapping("/detail")
+    public PaymentTypeVo detail(@RequestBody BaseSelectDto dto) {
+        return paymentTypeService.detail(dto.getId());
+    }
+
+    /**
+     * 收付款类型新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PaymentTypeDto paymentTypeDto) {
+        paymentTypeService.add(paymentTypeDto);
+    }
+
+    /**
+     * 收付款类型编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PaymentTypeDto paymentTypeDto) {
+        paymentTypeService.edit(paymentTypeDto);
+    }
+
+    /**
+     * 收付款类型删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        paymentTypeService.delete(dto.getId());
+    }
+
+}

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

@@ -29,4 +29,9 @@ public class AccountManagementSelectDto extends BaseSelectDto {
      * 生产公司id
      */
     private Long companyId;
+
+    /**
+     * 账户类型 10公账 20私账
+     */
+    private Integer type;
 }

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

@@ -2,10 +2,11 @@ package com.fjhx.account.entity.account.dto;
 
 import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.entity.tax.po.TaxRefundDetails;
+import com.fjhx.common.entity.claim.ClaimContract;
+import com.fjhx.file.entity.ObsFile;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -48,4 +49,11 @@ public class AccountRunningWaterDto extends AccountRunningWater {
      */
     private String commissionCurrency;
 
+    /**
+     * 凭证附件 类型0
+     */
+    private List<ObsFile> fileList;
+
+    private List<ClaimContract> claimContractList;
+
 }

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 记账科目新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class AccountSubjectsDto extends AccountSubjects {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.account.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 记账科目列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class AccountSubjectsSelectDto extends BaseSelectDto {
+
+}

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

@@ -11,11 +11,10 @@ public enum PaymentTypeEnum {
     REJECT("20", "采购付款"),
     RECEIVE("30", "退货到款登记"),
     ;
-    private String key;
+    private static Map<String, String> map = new LinkedHashMap<>();
 
     private String value;
-
-    private static Map<String, String> map = new LinkedHashMap<>();
+    private String key;
 
     PaymentTypeEnum(String key, String value) {
         this.key = key;

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

@@ -86,4 +86,9 @@ public class AccountManagement extends BasePo {
      */
     private Long companyId;
 
+    /**
+     * 10公账 20私账
+     */
+    private Integer type;
+
 }

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

@@ -132,4 +132,10 @@ public class AccountPayment extends BasePo {
      * 归属公司id
      */
     private Long companyId;
+    private String companyIds;
+
+    /**
+     * 费控id
+     */
+    private Long costControlId;
 }

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

@@ -1,12 +1,11 @@
 package com.fjhx.account.entity.account.po;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 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;
 
@@ -56,7 +55,6 @@ public class AccountRunningWater extends BasePo {
     /**
      * 币种（字典account_currency）
      */
-    @NotBlank(message = "币种不能为null")
     private String currency;
 
     /**
@@ -82,6 +80,7 @@ public class AccountRunningWater extends BasePo {
     /**
      * 交易时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date transactionTime;
 
     /**
@@ -99,11 +98,6 @@ public class AccountRunningWater extends BasePo {
      */
     private BigDecimal rate;
 
-    /**
-     * 条数
-     */
-    @TableField(exist = false)
-    private Integer count;
 
     /**
      * 打款记录id
@@ -120,4 +114,32 @@ public class AccountRunningWater extends BasePo {
      */
     private Long companyId;
 
+    /**
+     * 业务部门id
+     */
+    private Long deptId;
+    /**
+     * 我方账户名
+     */
+    private String myAccountName;
+    /**
+     * 我方开户账号
+     */
+    private String myAccountOpening;
+    /**
+     * 我方开户行
+     */
+    private String myOpeningBank;
+    /**
+     * 流水号
+     */
+    private String serialNumber;
+
+    private Long registerUserId;
+
+    /**
+     * 确认备注
+     */
+    private String confirmRemark;
+
 }

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

@@ -0,0 +1,61 @@
+package com.fjhx.account.entity.account.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 记账科目
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+@TableName("account_subjects")
+public class AccountSubjects extends BasePo {
+
+    /**
+     * 父级分类id
+     */
+    private Long parentId;
+
+    /**
+     * 父级分类id集合，用,拼接
+     */
+    private String parentIdSet;
+
+    /**
+     * 科目代码
+     */
+    private String subjectsCode;
+
+    /**
+     * 科目名称
+     */
+    private String subjectsName;
+
+    /**
+     * 核算项目名称
+     */
+    private String calculateItemName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+//    /**
+//     * 付款类型Id
+//     */
+//    private Long paymentTypeId;
+
+}

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

@@ -46,4 +46,7 @@ public class AccountPaymentVo extends AccountPayment {
      * 打开记录列表
      */
     private List<AccountPaymentRecordsVo> accountPaymentRecordsList;
+
+
+    private String typeName;
 }

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

@@ -2,6 +2,7 @@ package com.fjhx.account.entity.account.vo;
 
 import com.fjhx.account.entity.account.po.AccountDeptRunningWaterDetail;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
+import com.fjhx.common.entity.claim.vo.ClaimContractVo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -102,4 +103,12 @@ public class AccountRunningWaterVo extends AccountRunningWater {
      * 销售合同id集合
      */
     private String contractIds;
+
+    List<ClaimContractVo> claimContractList;
+
+    private String registerUserName;
+
+    private String companyName;
+
+    private String createUserName;
 }

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

@@ -0,0 +1,29 @@
+package com.fjhx.account.entity.account.vo;
+
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 记账科目列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class AccountSubjectsVo extends AccountSubjects {
+
+    /**
+     * 科目名称
+     */
+    private String subjectsName;
+
+    /**
+     * 核算项目名称
+     */
+    private String subjectsCalculateItemName;
+
+    private String accountSubjectsNames;
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.calculate.dto;
+
+import com.fjhx.account.entity.calculate.po.CalculateItem;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 核算项目新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-25
+ */
+@Getter
+@Setter
+public class CalculateItemDto extends CalculateItem {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.calculate.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 核算项目列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-25
+ */
+@Getter
+@Setter
+public class CalculateItemSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,36 @@
+package com.fjhx.account.entity.calculate.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 核算项目
+ * </p>
+ *
+ * @author
+ * @since 2024-03-25
+ */
+@Getter
+@Setter
+@TableName("calculate_item")
+public class CalculateItem extends BasePo {
+
+    /**
+     * 费控明细id
+     */
+    private Long costControlDetailId;
+
+    /**
+     * 核算类型 字典(accounting_subjects)
+     */
+    private String type;
+
+    /**
+     * 业务id
+     */
+    private Long businessId;
+
+}

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

@@ -0,0 +1,24 @@
+package com.fjhx.account.entity.calculate.vo;
+
+import com.fjhx.account.entity.calculate.po.CalculateItem;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 核算项目列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-25
+ */
+@Getter
+@Setter
+public class CalculateItemVo extends CalculateItem {
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    private String businessName;
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.payee.dto;
+
+import com.fjhx.account.entity.payee.po.PayeeInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 收款单位新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-20
+ */
+@Getter
+@Setter
+public class PayeeInfoDto extends PayeeInfo {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.payee.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 收款单位列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-20
+ */
+@Getter
+@Setter
+public class PayeeInfoSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,66 @@
+package com.fjhx.account.entity.payee.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 收款单位
+ * </p>
+ *
+ * @author
+ * @since 2024-03-20
+ */
+@Getter
+@Setter
+@TableName("payee_info")
+public class PayeeInfo extends BasePo {
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 税点
+     */
+    private Integer taxPoints;
+
+    /**
+     * 开户名
+     */
+    private String accountName;
+
+    /**
+     * 开户行
+     */
+    private String accountBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountNumber;
+
+    /**
+     * 归属公司
+     */
+    private Long companyId;
+
+}

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

@@ -0,0 +1,27 @@
+package com.fjhx.account.entity.payee.vo;
+
+import com.fjhx.account.entity.payee.po.PayeeInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 收款单位列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-20
+ */
+@Getter
+@Setter
+public class PayeeInfoVo extends PayeeInfo {
+
+    /**
+     * 结存预付款_含税
+     */
+    private String balancePrepaidTax;
+
+    /**
+     * 结存预付款
+     */
+    private String balancePrepaid;
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.payment.dto;
+
+import com.fjhx.account.entity.payment.po.PaymentType;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 收付款类型新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class PaymentTypeDto extends PaymentType {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.payment.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 收付款类型列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class PaymentTypeSelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,51 @@
+package com.fjhx.account.entity.payment.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 收付款类型
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+@TableName("payment_type")
+public class PaymentType extends BasePo {
+
+    /**
+     * 收付款名称
+     */
+    private String name;
+
+    /**
+     * 交易类型10收入20支出
+     */
+    private Integer tradeType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 动态字段json
+     */
+    private String dynamicFieldJson;
+
+    /**
+     * 记账科目Id
+     */
+    private Long accountSubjectsId;
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.account.entity.payment.vo;
+
+import com.fjhx.account.entity.payment.po.PaymentType;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 收付款类型列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class PaymentTypeVo extends PaymentType {
+
+}

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

@@ -0,0 +1,32 @@
+package com.fjhx.account.mapper.account;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记账科目 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface AccountSubjectsMapper extends BaseMapper<AccountSubjects> {
+
+    /**
+     * 记账科目列表
+     */
+    List<AccountSubjectsVo> getList(@Param("ew") IWrapper<AccountSubjects> wrapper);
+
+    /**
+     * 记账科目分页
+     */
+    Page<AccountSubjectsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AccountSubjects> wrapper);
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/calculate/CalculateItemMapper.java

@@ -0,0 +1,24 @@
+package com.fjhx.account.mapper.calculate;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.account.entity.calculate.po.CalculateItem;
+import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 核算项目 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-25
+ */
+public interface CalculateItemMapper extends BaseMapper<CalculateItem> {
+
+    List<CalculateItemVo> getList(@Param("ew") IWrapper<Object> wrapper);
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/payee/PayeeInfoMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.account.mapper.payee;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.payee.po.PayeeInfo;
+import com.fjhx.account.entity.payee.vo.PayeeInfoVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 收款单位 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-20
+ */
+public interface PayeeInfoMapper extends BaseMapper<PayeeInfo> {
+
+    /**
+     * 收款单位分页
+     */
+    Page<PayeeInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PayeeInfo> wrapper);
+
+}

hx-account/src/main/java/com/fjhx/account/mapper/payment/PaymentTypeMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.account.mapper.payment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.payment.po.PaymentType;
+import com.fjhx.account.entity.payment.vo.PaymentTypeVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 收付款类型 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface PaymentTypeMapper extends BaseMapper<PaymentType> {
+
+    /**
+     * 收付款类型分页
+     */
+    Page<PaymentTypeVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<PaymentType> wrapper);
+
+}

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

@@ -0,0 +1,52 @@
+package com.fjhx.account.service.account;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.account.dto.AccountSubjectsDto;
+import com.fjhx.account.entity.account.dto.AccountSubjectsSelectDto;
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
+import com.ruoyi.common.core.service.BaseService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记账科目 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface AccountSubjectsService extends BaseService<AccountSubjects> {
+
+    /**
+     * 记账科目列表
+     */
+    List<AccountSubjectsVo> getList(AccountSubjectsSelectDto dto);
+
+    /**
+     * 记账科目分页
+     */
+    Page<AccountSubjectsVo> getPage(AccountSubjectsSelectDto dto);
+
+    /**
+     * 记账科目明细
+     */
+    AccountSubjectsVo detail(Long id);
+
+    /**
+     * 记账科目新增
+     */
+    void add(AccountSubjectsDto accountSubjectsDto);
+
+    /**
+     * 记账科目编辑
+     */
+    void edit(AccountSubjectsDto accountSubjectsDto);
+
+    /**
+     * 记账科目删除
+     */
+    void delete(Long id);
+
+}

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

@@ -81,6 +81,10 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
         wrapper.in(AccountManagement::getCompanyId, SecurityUtils.getCompanyIds());
         wrapper.eq(AccountManagement::getCompanyId, dto.getCompanyId());
 
+        //对公 对私账户过滤
+        wrapper.eq(AccountManagement::getType, dto.getType());
+
+
         Page<AccountManagementVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         List<AccountManagementVo> records = page.getRecords();
         //赋值归属公司名称

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

@@ -10,11 +10,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.entity.account.dto.AccountPaymentDto;
 import com.fjhx.account.entity.account.dto.AccountRequestFundsSelectDto;
 import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
-import com.fjhx.account.entity.account.po.*;
+import com.fjhx.account.entity.account.po.AccountManagement;
+import com.fjhx.account.entity.account.po.AccountPayment;
+import com.fjhx.account.entity.account.po.AccountPaymentRecords;
+import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.entity.account.vo.AccountPaymentRecordsVo;
 import com.fjhx.account.entity.account.vo.AccountPaymentVo;
+import com.fjhx.account.entity.payment.po.PaymentType;
 import com.fjhx.account.mapper.account.AccountPaymentMapper;
-import com.fjhx.account.service.account.*;
+import com.fjhx.account.service.account.AccountManagementService;
+import com.fjhx.account.service.account.AccountPaymentRecordsService;
+import com.fjhx.account.service.account.AccountPaymentService;
+import com.fjhx.account.service.account.AccountRunningWaterService;
+import com.fjhx.account.service.payment.PaymentTypeService;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.file.utils.ObsFileUtil;
@@ -28,8 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -49,8 +56,6 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
     @Autowired
     private ISysDeptService sysDeptService;
 
-    @Autowired
-    private AccountRemainderService accountRemainderService;
 
     @Autowired
     private AccountRunningWaterService accountRunningWaterService;
@@ -61,6 +66,9 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
     @Autowired
     private AccountPaymentRecordsService accountPaymentRecordsService;
 
+    @Autowired
+    private PaymentTypeService paymentTypeService;
+
     @Override
     public Page<AccountPaymentVo> getPage(AccountRequestFundsSelectDto dto) {
 
@@ -98,7 +106,7 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         wrapper.like(ObjectUtil.isNotEmpty(dto.getOppositeAccountName()), "ap.name", dto.getOppositeAccountName());
 
         //权限过滤：打款-子公司看自己的
-        wrapper.in("ap.company_id", SecurityUtils.getCompanyIds());
+//        wrapper.in("ap.company_id", SecurityUtils.getCompanyIds());
         wrapper.eq(ObjectUtil.isNotEmpty(dto.getCompanyId()), "ap.company_id", dto.getCompanyId());
 
 
@@ -108,11 +116,6 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
             return page;
         }
 
-//        // 赋值公司名称信息
-//        corporationService.attributeAssign(records, AccountPaymentVo::getCorporationId, (item, corporation) -> {
-//            item.setCorporationName(corporation.getName());
-//        });
-
         // 赋值用户名称
         UserUtil.assignmentNickName(records, AccountPayment::getDataUser, AccountPaymentVo::setUserName);
 
@@ -120,9 +123,33 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         List<SysDept> sysDeptList = sysDeptService.list();
         Map<Long, String> deptMap = sysDeptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
 
+        //付款类型
+        Map<Long, String> paymentTypeMap = paymentTypeService.mapKV(PaymentType::getId, PaymentType::getName, q -> q.orderByAsc(PaymentType::getId));
+
         for (AccountPaymentVo record : records) {
-            record.setCorporationName(deptMap.get(record.getCorporationId()));
+            List<String> nameList = new ArrayList<>();
+
+            String companyIds = record.getCompanyIds();
+            if (ObjectUtil.isNull(companyIds)) {
+                companyIds = "";
+            }
+            List<Long> collect = Arrays.stream(companyIds.split(","))
+                    .filter(item -> ObjectUtil.isNotEmpty(item)).map(Long::valueOf).collect(Collectors.toList());
+            collect.add(record.getCompanyId());
+            collect = collect.stream().filter(Objects::nonNull).distinct().collect(Collectors.toList());
+            for (Long aLong : collect) {
+                nameList.add(deptMap.getOrDefault(aLong, String.valueOf(aLong)));
+            }
+
+            record.setCorporationName(nameList.stream().collect(Collectors.joining(",")));
             record.setDeptName(deptMap.get(record.getDepartmentId()));
+
+            //赋值付款类型
+            String type = record.getType();
+            if (ObjectUtil.isNotEmpty(type) && type.matches("\\d+")) {
+                record.setTypeName(paymentTypeMap.get(Long.valueOf(type)));
+            }
+
         }
 
         return page;
@@ -179,19 +206,19 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         Long companyId = SecurityUtils.getCompanyId();
         accountPaymentDto.setCompanyId(companyId);
 
-        AccountRemainder accountRemainder = accountRemainderService.getOne(Wrappers.<AccountRemainder>lambdaQuery()
-                .eq(AccountRemainder::getAccountManagementId, accountPaymentDto.getAccountManagementId())
-                .eq(AccountRemainder::getCurrency, accountPaymentDto.getCurrency()));
-
-        // 如果不存在这条数据则返回账户余额不足
-        if (ObjectUtil.isEmpty(accountRemainder)) {
-            throw new ServiceException("该账户不存在此币种，请前往资金账户添加");
-        }
-
-        // 如果余额小于付款金额则返回账户余额不足
-        if (accountRemainder.getRemainder().compareTo(accountPaymentDto.getAmount()) < 0) {
-            throw new ServiceException("账户余额不足");
-        }
+//        AccountRemainder accountRemainder = accountRemainderService.getOne(Wrappers.<AccountRemainder>lambdaQuery()
+//                .eq(AccountRemainder::getAccountManagementId, accountPaymentDto.getAccountManagementId())
+//                .eq(AccountRemainder::getCurrency, accountPaymentDto.getCurrency()));
+//
+//        // 如果不存在这条数据则返回账户余额不足
+//        if (ObjectUtil.isEmpty(accountRemainder)) {
+//            throw new ServiceException("该账户不存在此币种，请前往资金账户添加");
+//        }
+//
+//        // 如果余额小于付款金额则返回账户余额不足
+//        if (accountRemainder.getRemainder().compareTo(accountPaymentDto.getAmount()) < 0) {
+//            throw new ServiceException("账户余额不足");
+//        }
 
         //刷新打款信息
         AccountPayment oldAccountPayment = this.getById(accountPaymentDto.getId());
@@ -227,13 +254,13 @@ public class AccountPaymentServiceImpl extends ServiceImpl<AccountPaymentMapper,
         accountPaymentRecords.setCompanyId(companyId);
         accountPaymentRecordsService.save(accountPaymentRecords);
 
-        // 赋值变更金额
-        accountRemainder.setChangeRemainder(accountPaymentDto.getAmount());
-        // 修改账户-余额表的中余额
-        accountRemainder.setRemainder(accountRemainder.getRemainder().subtract(accountPaymentDto.getAmount()));
-        // 打款的交易状态都是支出
-        accountRemainder.setStatus("20");
-        accountRemainderService.updateById(accountRemainder);
+//        // 赋值变更金额
+//        accountRemainder.setChangeRemainder(accountPaymentDto.getAmount());
+//        // 修改账户-余额表的中余额
+//        accountRemainder.setRemainder(accountRemainder.getRemainder().subtract(accountPaymentDto.getAmount()));
+//        // 打款的交易状态都是支出
+//        accountRemainder.setStatus("20");
+//        accountRemainderService.updateById(accountRemainder);
 
         // 添加附件信息
         ObsFileUtil.saveFile(accountPaymentDto.getFileList(), accountPaymentRecords.getId());

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

@@ -27,7 +27,6 @@ import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.service.flow.FlowExampleService;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -195,20 +194,18 @@ public class AccountRequestFundsServiceImpl extends ServiceImpl<AccountRequestFu
 
         // 查询归属公司的名称
         Corporation corporation = corporationService.getById(accountRequestFundsVo.getCorporationId());
-        if (ObjectUtil.isEmpty(corporation)) {
-            throw new ServiceException("没有找到归属公司信息");
+        if (ObjectUtil.isNotEmpty(corporation)) {
+            accountRequestFundsVo.setCorporationName(corporation.getName());
         }
-        accountRequestFundsVo.setCorporationName(corporation.getName());
 
         // 切换数据源
         DynamicDataSourceContextHolder.push(SourceConstant.BASE);
 
         // 查询部门名称信息
         SysDept sysDept = sysDeptService.getById(accountRequestFundsVo.getDepartmentId());
-        if (ObjectUtil.isEmpty(sysDept)) {
-            throw new ServiceException("没有找到归属部门信息");
+        if (ObjectUtil.isNotEmpty(sysDept)) {
+            accountRequestFundsVo.setDeptName(sysDept.getDeptName());
         }
-        accountRequestFundsVo.setDeptName(sysDept.getDeptName());
 
         // 赋值流程实例id
         FlowExample flowExample = flowExampleService.getOne(q -> q.eq(FlowExample::getBusinessId, accountRequestFunds.getId()));

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

@@ -26,14 +26,17 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.service.corporation.CorporationService;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.file.utils.ObsFileUtil;
 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.ruoyi.common.core.domain.BaseSelectDto;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -71,6 +74,8 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
 
     @Autowired
     private AccountService accountService;
+    @Autowired
+    private ISysDeptService deptService;
 
 
     /**
@@ -142,10 +147,19 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         QueryWrapper<Object> wrapper = getPageWrapper(dto);
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<AccountRunningWaterVo> records = page.getRecords();
-        //赋值归属公司名称
-        corporationService.attributeAssign(records, AccountRunningWaterVo::getCorporationId, (item, corporation) -> {
-            item.setCorporationName(corporation.getName());
-        });
+//        //赋值归属公司名称
+//        corporationService.attributeAssign(records, AccountRunningWaterVo::getCorporationId, (item, corporation) -> {
+//            item.setCorporationName(corporation.getName());
+//        });
+
+        // 查询部门信息
+        List<SysDept> sysDeptList = deptService.list();
+        Map<Long, String> sysDeptMap = sysDeptList.stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+
+        for (AccountRunningWaterVo record : records) {
+            record.setCorporationName(sysDeptMap.get(record.getCompanyId()));
+        }
+
         return page;
     }
 
@@ -232,34 +246,37 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
             dto.setRate(divide);
         }
 
-        // 修改账户余额表的余额
-        AccountRemainder accountRemainder = accountRemainderService.getOne(q -> q
-                .eq(AccountRemainder::getAccountManagementId, dto.getAccountManagementId())
-                .eq(AccountRemainder::getCurrency, dto.getCurrency())
-        );
-
-        if (ObjectUtil.isEmpty(accountRemainder)) {
-            throw new ServiceException("该账户不存在此币种，请前往资金账户添加");
-        }
-        BigDecimal amount = dto.getAmount();
-        String status = dto.getStatus();
-        BigDecimal remainder = accountRemainder.getRemainder();
-
-        accountRemainder.setStatus(status);
-        accountRemainder.setChangeRemainder(amount);
-
-        if (status.equals("10")) {
-            accountRemainder.setRemainder(remainder.add(amount));
-        } else if (status.equals("20")) {
-            if (remainder.compareTo(amount) < 0) {
-                throw new ServiceException("账户余额不足");
-            }
-            accountRemainder.setRemainder(remainder.subtract(amount));
-        }
-        accountRemainderService.updateById(accountRemainder);
+//        // 修改账户余额表的余额
+//        AccountRemainder accountRemainder = accountRemainderService.getOne(q -> q
+//                .eq(AccountRemainder::getAccountManagementId, dto.getAccountManagementId())
+//                .eq(AccountRemainder::getCurrency, dto.getCurrency())
+//        );
+//
+//        if (ObjectUtil.isEmpty(accountRemainder)) {
+//            throw new ServiceException("该账户不存在此币种，请前往资金账户添加");
+//        }
+//        BigDecimal amount = dto.getAmount();
+//        String status = dto.getStatus();
+//        BigDecimal remainder = accountRemainder.getRemainder();
+//
+//        accountRemainder.setStatus(status);
+//        accountRemainder.setChangeRemainder(amount);
+//
+//        if (status.equals("10")) {
+//            accountRemainder.setRemainder(remainder.add(amount));
+//        } else if (status.equals("20")) {
+//            if (remainder.compareTo(amount) < 0) {
+//                throw new ServiceException("账户余额不足");
+//            }
+//            accountRemainder.setRemainder(remainder.subtract(amount));
+//        }
+//        accountRemainderService.updateById(accountRemainder);
 
         this.save(dto);
 
+        //保存凭证附件
+        ObsFileUtil.saveFile(dto.getFileList(), dto.getBusinessId());
+
         // 发送消息推送
         sendSocket(dto);
     }
@@ -322,7 +339,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
 
     @DSTransactional
     @Override
-    public void delete(Long id) {
+    public synchronized void delete(Long id) {
         AccountRunningWater accountRunningWater = getById(id);
         Assert.notEmpty(accountRunningWater, "获取不到该流水信息");
 
@@ -333,6 +350,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         //操作余额
         changeRemainder(accountRunningWater);
 
+        if (ObjectUtil.equals(accountRunningWater.getIsClaim(), 1)) {
+            throw new ServiceException("该回款已被确认，禁止删除！");
+        }
+
         this.removeById(id);
     }
 
@@ -487,44 +508,44 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
      * 余额操作
      */
     private void changeRemainder(AccountRunningWater accountRunningWater) {
-        // 修改账户余额表的余额
-        AccountRemainder accountRemainder = accountRemainderService.getOne(q -> q
-                .eq(AccountRemainder::getAccountManagementId, accountRunningWater.getAccountManagementId())
-                .eq(AccountRemainder::getCurrency, accountRunningWater.getCurrency())
-        );
-        if (ObjectUtil.isEmpty(accountRemainder)) {
-            throw new ServiceException("该账户不存在此币种，请前往资金账户添加");
-        }
-        BigDecimal amount = accountRunningWater.getAmount();
-        String status = accountRunningWater.getStatus();
-        BigDecimal remainder = accountRemainder.getRemainder();
-
-        accountRemainder.setStatus(status);
-        accountRemainder.setChangeRemainder(amount);
-
-        boolean update = false;
-        if ("10".equals(accountRunningWater.getStatus())) {
-            //收入操作
-            update = accountRemainderService.update(q -> q
-                    .setSql("remainder = remainder + " + accountRunningWater.getAmount())
-                    .setSql("change_remainder = " + accountRunningWater.getAmount())
-                    .eq(AccountRemainder::getId, accountRemainder.getId())
-            );
-        } else {
-            //支出操作
-            BigDecimal subtract = remainder.subtract(amount);
-            if (subtract.compareTo(BigDecimal.ZERO) < 0) {
-                throw new ServiceException("账户余额不足");
-            }
-
-            update = accountRemainderService.update(q -> q
-                    .setSql("remainder = remainder - " + accountRunningWater.getAmount())
-                    .setSql("change_remainder = " + accountRunningWater.getAmount())
-                    .eq(AccountRemainder::getId, accountRemainder.getId())
-                    .apply("remainder - {0} >= 0", accountRunningWater.getAmount())
-            );
-        }
-        Assert.eqTrue(update, "余额操作失败,请重试！！！");
+//        // 修改账户余额表的余额
+//        AccountRemainder accountRemainder = accountRemainderService.getOne(q -> q
+//                .eq(AccountRemainder::getAccountManagementId, accountRunningWater.getAccountManagementId())
+//                .eq(AccountRemainder::getCurrency, accountRunningWater.getCurrency())
+//        );
+//        if (ObjectUtil.isEmpty(accountRemainder)) {
+//            throw new ServiceException("该账户不存在此币种，请前往资金账户添加");
+//        }
+//        BigDecimal amount = accountRunningWater.getAmount();
+//        String status = accountRunningWater.getStatus();
+//        BigDecimal remainder = accountRemainder.getRemainder();
+//
+//        accountRemainder.setStatus(status);
+//        accountRemainder.setChangeRemainder(amount);
+//
+//        boolean update = false;
+//        if ("10".equals(accountRunningWater.getStatus())) {
+//            //收入操作
+//            update = accountRemainderService.update(q -> q
+//                    .setSql("remainder = remainder + " + accountRunningWater.getAmount())
+//                    .setSql("change_remainder = " + accountRunningWater.getAmount())
+//                    .eq(AccountRemainder::getId, accountRemainder.getId())
+//            );
+//        } else {
+//            //支出操作
+//            BigDecimal subtract = remainder.subtract(amount);
+//            if (subtract.compareTo(BigDecimal.ZERO) < 0) {
+//                throw new ServiceException("账户余额不足");
+//            }
+//
+//            update = accountRemainderService.update(q -> q
+//                    .setSql("remainder = remainder - " + accountRunningWater.getAmount())
+//                    .setSql("change_remainder = " + accountRunningWater.getAmount())
+//                    .eq(AccountRemainder::getId, accountRemainder.getId())
+//                    .apply("remainder - {0} >= 0", accountRunningWater.getAmount())
+//            );
+//        }
+//        Assert.eqTrue(update, "余额操作失败,请重试！！！");
     }
 
     @Override

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

@@ -0,0 +1,122 @@
+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.AccountSubjectsDto;
+import com.fjhx.account.entity.account.dto.AccountSubjectsSelectDto;
+import com.fjhx.account.entity.account.po.AccountSubjects;
+import com.fjhx.account.entity.account.vo.AccountSubjectsVo;
+import com.fjhx.account.mapper.account.AccountSubjectsMapper;
+import com.fjhx.account.service.account.AccountSubjectsService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 记账科目 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Service
+public class AccountSubjectsServiceImpl extends ServiceImpl<AccountSubjectsMapper, AccountSubjects> implements AccountSubjectsService {
+
+    @Override
+    public List<AccountSubjectsVo> getList(AccountSubjectsSelectDto dto) {
+        IWrapper<AccountSubjects> wrapper = getWrapper();
+
+        wrapper.keyword(dto.getKeyword(), new SqlField("asu.subjects_name"), new SqlField("calculate_item_name"));
+
+        wrapper.orderByAsc("asu", AccountSubjects::getSort);
+
+        wrapper.orderByDesc("asu", AccountSubjects::getId);
+        List<AccountSubjectsVo> list = this.baseMapper.getList(wrapper);
+
+        if (ObjectUtil.isEmpty(list)) {
+            return list;
+        }
+
+        //赋值记账科目信息
+        Map<Long, AccountSubjects> accountSubjectsMap = this.mapKEntity(AccountSubjects::getId, q -> q.orderByAsc(AccountSubjects::getId));
+
+        for (AccountSubjectsVo accountSubjectsVo : list) {
+            //赋值记账科目树
+            int iCount = 0;
+            List<String> subjectsNameGroup = new ArrayList<>();
+            AccountSubjects accountSubjects = accountSubjectsMap.get(accountSubjectsVo.getId());
+            while (accountSubjects != null && iCount < 50) {
+                iCount++;
+                subjectsNameGroup.add(0, accountSubjects.getSubjectsName());
+                accountSubjects = accountSubjectsMap.get(accountSubjects.getParentId());
+            }
+            accountSubjectsVo.setAccountSubjectsNames(subjectsNameGroup.stream().collect(Collectors.joining(" / ")));
+        }
+
+        return list;
+    }
+
+    @Override
+    public Page<AccountSubjectsVo> getPage(AccountSubjectsSelectDto dto) {
+        IWrapper<AccountSubjects> wrapper = getWrapper();
+
+        wrapper.keyword(dto.getKeyword(), new SqlField("asu.subjects_name"), new SqlField("calculate_item_name"));
+
+        wrapper.orderByAsc("asu", AccountSubjects::getSort);
+
+        wrapper.orderByDesc("asu", AccountSubjects::getId);
+        Page<AccountSubjectsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public AccountSubjectsVo detail(Long id) {
+        AccountSubjects AccountSubjects = this.getById(id);
+        AccountSubjectsVo result = BeanUtil.toBean(AccountSubjects, AccountSubjectsVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(AccountSubjectsDto accountSubjectsDto) {
+        Long parentId = accountSubjectsDto.getParentId();
+        if (parentId == null || parentId == 0L) {
+            accountSubjectsDto.setParentId(0L);
+            accountSubjectsDto.setParentIdSet(null);
+        } else {
+            // 查询父级分类
+            AccountSubjects parentClassify = getById(parentId);
+            if (parentClassify == null) {
+                throw new ServiceException("没有找到父级分类");
+            }
+
+            // 赋值父级id集合
+            String parentIdSet = parentClassify.getParentIdSet();
+            accountSubjectsDto.setParentIdSet((ObjectUtil.isEmpty(parentIdSet) ? "" : parentIdSet + ",") + parentId);
+        }
+
+        this.save(accountSubjectsDto);
+    }
+
+    @Override
+    public void edit(AccountSubjectsDto accountSubjectsDto) {
+        this.updateById(accountSubjectsDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.remove(q -> q
+                .eq(AccountSubjects::getId, id)
+                .or().apply("FIND_IN_SET({0},parent_id_set)", id)
+        );
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/service/calculate/CalculateItemService.java

@@ -0,0 +1,24 @@
+package com.fjhx.account.service.calculate;
+
+import com.fjhx.account.entity.calculate.po.CalculateItem;
+import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
+import com.ruoyi.common.core.service.BaseService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 核算项目 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-25
+ */
+public interface CalculateItemService extends BaseService<CalculateItem> {
+
+    List<CalculateItemVo> getList(@Param("ew") IWrapper<Object> wrapper);
+
+}

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

@@ -0,0 +1,29 @@
+package com.fjhx.account.service.calculate.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.calculate.po.CalculateItem;
+import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
+import com.fjhx.account.mapper.calculate.CalculateItemMapper;
+import com.fjhx.account.service.calculate.CalculateItemService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 核算项目 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-25
+ */
+@Service
+public class CalculateItemServiceImpl extends ServiceImpl<CalculateItemMapper, CalculateItem> implements CalculateItemService {
+
+    @Override
+    public List<CalculateItemVo> getList(IWrapper<Object> wrapper) {
+        return baseMapper.getList(wrapper);
+    }
+}

hx-account/src/main/java/com/fjhx/account/service/payee/PayeeInfoService.java

@@ -0,0 +1,46 @@
+package com.fjhx.account.service.payee;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.payee.dto.PayeeInfoDto;
+import com.fjhx.account.entity.payee.dto.PayeeInfoSelectDto;
+import com.fjhx.account.entity.payee.po.PayeeInfo;
+import com.fjhx.account.entity.payee.vo.PayeeInfoVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 收款单位 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-20
+ */
+public interface PayeeInfoService extends BaseService<PayeeInfo> {
+
+    /**
+     * 收款单位分页
+     */
+    Page<PayeeInfoVo> getPage(PayeeInfoSelectDto dto);
+
+    /**
+     * 收款单位明细
+     */
+    PayeeInfoVo detail(Long id);
+
+    /**
+     * 收款单位新增
+     */
+    void add(PayeeInfoDto payeeInfoDto);
+
+    /**
+     * 收款单位编辑
+     */
+    void edit(PayeeInfoDto payeeInfoDto);
+
+    /**
+     * 收款单位删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,59 @@
+package com.fjhx.account.service.payee.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.payee.dto.PayeeInfoDto;
+import com.fjhx.account.entity.payee.dto.PayeeInfoSelectDto;
+import com.fjhx.account.entity.payee.po.PayeeInfo;
+import com.fjhx.account.entity.payee.vo.PayeeInfoVo;
+import com.fjhx.account.mapper.payee.PayeeInfoMapper;
+import com.fjhx.account.service.payee.PayeeInfoService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 收款单位 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-20
+ */
+@Service
+public class PayeeInfoServiceImpl extends ServiceImpl<PayeeInfoMapper, PayeeInfo> implements PayeeInfoService {
+
+    @Override
+    public Page<PayeeInfoVo> getPage(PayeeInfoSelectDto dto) {
+        IWrapper<PayeeInfo> wrapper = getWrapper();
+
+        wrapper.orderByAsc("pi", PayeeInfo::getSort);
+        wrapper.orderByDesc("pi", PayeeInfo::getId);
+        Page<PayeeInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public PayeeInfoVo detail(Long id) {
+        PayeeInfo PayeeInfo = this.getById(id);
+        PayeeInfoVo result = BeanUtil.toBean(PayeeInfo, PayeeInfoVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PayeeInfoDto payeeInfoDto) {
+        this.save(payeeInfoDto);
+    }
+
+    @Override
+    public void edit(PayeeInfoDto payeeInfoDto) {
+        this.updateById(payeeInfoDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

hx-account/src/main/java/com/fjhx/account/service/payment/PaymentTypeService.java

@@ -0,0 +1,46 @@
+package com.fjhx.account.service.payment;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.account.entity.payment.dto.PaymentTypeDto;
+import com.fjhx.account.entity.payment.dto.PaymentTypeSelectDto;
+import com.fjhx.account.entity.payment.po.PaymentType;
+import com.fjhx.account.entity.payment.vo.PaymentTypeVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 收付款类型 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface PaymentTypeService extends BaseService<PaymentType> {
+
+    /**
+     * 收付款类型分页
+     */
+    Page<PaymentTypeVo> getPage(PaymentTypeSelectDto dto);
+
+    /**
+     * 收付款类型明细
+     */
+    PaymentTypeVo detail(Long id);
+
+    /**
+     * 收付款类型新增
+     */
+    void add(PaymentTypeDto paymentTypeDto);
+
+    /**
+     * 收付款类型编辑
+     */
+    void edit(PaymentTypeDto paymentTypeDto);
+
+    /**
+     * 收付款类型删除
+     */
+    void delete(Long id);
+
+}

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

@@ -0,0 +1,58 @@
+package com.fjhx.account.service.payment.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.payment.dto.PaymentTypeDto;
+import com.fjhx.account.entity.payment.dto.PaymentTypeSelectDto;
+import com.fjhx.account.entity.payment.po.PaymentType;
+import com.fjhx.account.entity.payment.vo.PaymentTypeVo;
+import com.fjhx.account.mapper.payment.PaymentTypeMapper;
+import com.fjhx.account.service.payment.PaymentTypeService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 收付款类型 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Service
+public class PaymentTypeServiceImpl extends ServiceImpl<PaymentTypeMapper, PaymentType> implements PaymentTypeService {
+
+    @Override
+    public Page<PaymentTypeVo> getPage(PaymentTypeSelectDto dto) {
+        IWrapper<PaymentType> wrapper = getWrapper();
+        wrapper.orderByAsc("pt", PaymentType::getSort);
+        wrapper.orderByDesc("pt", PaymentType::getId);
+        Page<PaymentTypeVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public PaymentTypeVo detail(Long id) {
+        PaymentType PaymentType = this.getById(id);
+        PaymentTypeVo result = BeanUtil.toBean(PaymentType, PaymentTypeVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(PaymentTypeDto paymentTypeDto) {
+        this.save(paymentTypeDto);
+    }
+
+    @Override
+    public void edit(PaymentTypeDto paymentTypeDto) {
+        this.updateById(paymentTypeDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

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

@@ -3,50 +3,53 @@
 <mapper namespace="com.fjhx.account.mapper.account.AccountRunningWaterMapper">
     <!--这段代码正常是不需要跨库查询的。但是一开始封装包的时候分装的不合理，pom里面包是不能互相引用的。account包继承sale包会出现依赖冲突，目前不好改动，只能跨库查询-->
     <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
-        SELECT arw.*
-             , if(arw.type = 40, (select GROUP_CONCAT(c.`code`)
-                                  from tax_refund_details trd
-                                           left join contract c on c.id = trd.contract_id
-                                  where trd.account_running_water_id = arw.id),
-                  (SELECT IF
-                              (t1.type = 20, GROUP_CONCAT(c.`code`), GROUP_CONCAT(t4.`code`)) contractCodes
-                   FROM account_payment t1
-                            LEFT JOIN account_request_funds t2 ON t1.business_id = t2.id
-                            LEFT JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
-                            LEFT JOIN `bytesailing_sale`.contract t4 ON t3.contract_id = t4.id
-                       --采购付款来源
-                            LEFT JOIN pay pa ON t1.business_id = pa.id
-                            LEFT JOIN pay_detail pad
-                      ON pad.pay_id = pa.id
-                      LEFT JOIN purchase p ON pad.purchase_id = p.id
-                      LEFT JOIN contract c ON p.data_resource_id = c.id
-                      WHERE
-                      t1.id = arw.business_id ) )AS contractCodes
-
-             , if(arw.type = 40, (select GROUP_CONCAT(trd.contract_id)
-                                  from tax_refund_details trd
-                                  where trd.account_running_water_id = arw.id), (SELECT IF
-                                                                                            (t1.type = 20,
-                                                                                             GROUP_CONCAT(c.id),
-                                                                                             GROUP_CONCAT(t4.id)) contractIds
-                                                                                 FROM account_payment t1
-                                                                                          LEFT JOIN account_request_funds t2
-                                                                                                    ON t1.business_id = t2.id
-                                                                                          LEFT JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
-                                                                                          LEFT JOIN `bytesailing_sale`.contract t4
-                                                                                                    ON t3.contract_id = t4.id
-                                                                                     --采购付款来源
-                                                                                          LEFT JOIN pay pa ON t1.business_id = pa.id
-                                                                                          LEFT JOIN pay_detail pad ON pad.pay_id = pa.id
-                      LEFT JOIN purchase p ON pad.purchase_id = p.id
-                      LEFT JOIN contract c ON p.data_resource_id = c.id
-                      WHERE
-                      t1.id = arw.business_id )) AS contractIds
-             , am.alias                             accountManagementName
-             , am.corporation_id
+        SELECT arw.*,
+               am.alias accountManagementName,
+               am.corporation_id,
+               t2.contractIds,
+               t2.contractCodes
         FROM account_running_water arw
-                 LEFT JOIN account_management am
-                           ON arw.account_management_id = am.id
+                 LEFT JOIN account_management am ON arw.account_management_id = am.id
+                 LEFT JOIN (SELECT GROUP_CONCAT(t1.contractCode) AS contractCodes,
+                                   GROUP_CONCAT(t1.contractId)   AS contractIds,
+                                   t1.accountRunningWaterId
+                            FROM ((--#到账认领
+                                      SELECT c.`code`       AS contractCode,
+                                             c.id           AS contractId,
+                                             cl.business_id AS accountRunningWaterId
+                                      FROM claim cl
+                                               JOIN claim_contract clc ON clc.claim_id = cl.id
+                                               JOIN contract c ON clc.contract_id = c.id)
+                                  UNION ALL
+                                  (--#退税
+                                      SELECT c.`code`                     AS contractCode,
+                                             c.`id`                       AS contractId,
+                                             trd.account_running_water_id AS accountRunningWaterId
+                                      FROM tax_refund_details trd
+                                               LEFT JOIN contract c ON c.id = trd.contract_id)
+                                  UNION ALL
+                                  (--#采购付款
+                                      SELECT c.`code` AS contractCode,
+                                             c.id     AS contractId,
+                                             arw.id   AS accountRunningWaterId
+                                      FROM account_running_water arw
+                                               JOIN account_payment t1 ON arw.business_id = t1.id
+                                               JOIN pay pa ON t1.business_id = pa.id
+                                               JOIN pay_detail pad
+                                      ON pad.pay_id = pa.id
+                                          JOIN purchase p ON pad.purchase_id = p.id
+                                          JOIN contract c ON p.data_resource_id = c.id)
+                                  UNION ALL
+                                  (--#请款-打款
+                                      SELECT t4.`code` AS contractCode,
+                                             t4.id     AS contractId,
+                                             arw.id    AS accountRunningWaterId
+                                      FROM account_running_water arw
+                                               JOIN account_payment t1 ON arw.business_id = t1.id
+                                               JOIN account_request_funds t2 ON t1.business_id = t2.id
+                                               JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
+                                               JOIN contract t4 ON t3.contract_id = t4.id)) t1
+                            GROUP BY t1.accountRunningWaterId) t2 ON t2.accountRunningWaterId = arw.id
             ${ew.customSqlSegment}
     </select>
     <select id="getDetail" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.account.mapper.account.AccountSubjectsMapper">
+    <select id="getList" resultType="com.fjhx.account.entity.account.vo.AccountSubjectsVo">
+        select asu.*
+        from account_subjects asu
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountSubjectsVo">
+        select asu.*
+        from account_subjects asu
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-account/src/main/resources/mapper/calculate/CalculateItemMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.account.mapper.calculate.CalculateItemMapper">
+    <select id="getList" resultType="com.fjhx.account.entity.calculate.vo.CalculateItemVo">
+        SELECT *
+        FROM calculate_item ${ew.customSqlSegment}
+    </select>
+</mapper>

hx-account/src/main/resources/mapper/payee/PayeeInfoMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.account.mapper.payee.PayeeInfoMapper">
+    <select id="getPage" resultType="com.fjhx.account.entity.payee.vo.PayeeInfoVo">
+        SELECT pi.id,
+               pi.CODE,
+               pi.NAME,
+               pi.type,
+               pi.sort,
+               pi.tax_points,
+               pi.account_name,
+               pi.account_bank,
+               pi.account_number,
+               pi.company_id,
+               pi.create_user,
+               pi.create_time,
+               pi.update_user,
+               pi.update_time,
+               IFNULL(t1.balancePrepaid, 0)    AS balancePrepaid,
+               IFNULL(t1.balancePrepaidTax, 0) AS balancePrepaidTax
+        FROM payee_info pi
+                 LEFT JOIN (SELECT ccod.payee_account_id,
+                                   (IFNULL(sum(IF(cco.is_public_transfer = 0, apr.amount, 0)), 0) -
+                                    IFNULL(sum(IF(cco.is_public_transfer = 0, ccod.deduction_prepaid, 0)),
+                                           0))                                                                     AS balancePrepaid,
+                                   (IFNULL(sum(IF(cco.is_public_transfer = 1, apr.amount, 0)), 0) -
+                                    IFNULL(sum(IF(cco.is_public_transfer = 1, ccod.deduction_prepaid_tax, 0)),
+                                           0))                                                                     AS balancePrepaidTax
+                            FROM payment_type pt
+                                     JOIN cost_control cco ON cco.cost_type = pt.id
+                                     JOIN cost_control_detail ccod ON ccod.cost_control_id = cco.id
+                                     JOIN account_payment ap ON ap.cost_control_id = cco.id
+                                     JOIN account_payment_records apr ON apr.account_payment_id = ap.id
+                            WHERE cco.`status` IN (30, 60)
+                            GROUP BY ccod.payee_account_id) t1 ON t1.payee_account_id = pi.id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-account/src/main/resources/mapper/payment/PaymentTypeMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.account.mapper.payment.PaymentTypeMapper">
+    <select id="getPage" resultType="com.fjhx.account.entity.payment.vo.PaymentTypeVo">
+        select *
+        from payment_type pt
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-account/src/main/resources/mapper/write/WriteOffRecordsMapper.xml

@@ -18,7 +18,7 @@
                   (SELECT GROUP_CONCAT(t4.`code`)
                    FROM account_request_funds t2
                             LEFT JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
-                            LEFT JOIN `bytesailing_sale`.contract t4 ON t3.contract_id = t4.id
+                            LEFT JOIN contract t4 ON t3.contract_id = t4.id
                    where ap.business_id = t2.id),
                   (SELECT GROUP_CONCAT(if(c.`code` is null, p.`code`, c.`code`))
                    FROM pay pa

hx-admin/src/main/resources/application-prod.yml

@@ -6,9 +6,9 @@ spring:
             primary: base
             datasource:
               base:
-                url: jdbc:mysql://121.37.194.75:30102/sanfan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                url: jdbc:mysql://172.16.0.6:3306/sanfan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                 username: root
-                password: 5fWD*oa^nso@kmKa
+                password: 7)YnDVCi0^Zo@df
 
     # redis 配置
     redis:
@@ -19,7 +19,7 @@ spring:
         # 数据库索引
         database: 1
         # 密码
-        password: ss34dsA3DdsF
+        password: yvM3tyRjhSNH(3^
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -39,12 +39,11 @@ server:
 
 mail:
     # 调用邮箱服务url前缀
-    urlPrefix: http://localhost:8088/mailService/
+  urlPrefix:
     abroadUrlPrefix:
-    #abroadUrlPrefix: http://159.138.54.234:8088/mailService/
 
 hx:
-    httpUrl: http://139.159.251.109:81/prod-api/
+  httpUrl: http://175.178.26.5:80/prod-api/
 
 # token配置
 token:

hx-admin/src/main/resources/application-test.yml

@@ -45,7 +45,6 @@ mail:
 
 hx:
     httpUrl: http://36.134.91.96:10006/test-api/
-    fileServiceUrl: http://127.0.0.1:8090
 
 # token配置
 token:

hx-admin/src/main/resources/application.yml

@@ -166,10 +166,13 @@ xss:
 obs:
   #huawei / tencent
   type: tencent
+  region: ap-guangzhou
   #secretId
-  ak: AKIDmPqHhzAHM9sSwFd4dHpIm9MNBnMnIk7T
+  ak: AKIDufCVcaOH5kHdloxACMUVNoCTcdXcYGjW
   #secretKey
-  sk: XBjFf1Lc1VM3b1IRtHPKIRZhyCYqDf1G
-  endPoint: cos.ap-shanghai.myqcloud.com
-  url: https://xmhjc-1322241475.cos.ap-shanghai.myqcloud.com/
-  bucketName: xmhjc-1322241475
+  sk: 1yzIlLqNwX3ZtDLG2hHjN0Ohp01xoaPB
+  endPoint: cos.ap-guangzhou.myqcloud.com
+  url: https://sanfan-1324572223.cos.ap-guangzhou.myqcloud.com/
+  bucketName: sanfan-1324572223
+hx:
+  fileServiceUrl: http://127.0.0.1:8090

hx-common/src/main/java/com/fjhx/common/controller/Label.java

@@ -0,0 +1,13 @@
+package com.fjhx.common.controller;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Label {
+    String value();
+}
+ 

hx-common/src/main/java/com/fjhx/common/controller/art/ArtCopyrightController.java

@@ -0,0 +1,71 @@
+package com.fjhx.common.controller.art;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.art.dto.ArtCopyrightDto;
+import com.fjhx.common.entity.art.dto.ArtCopyrightSelectDto;
+import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
+import com.fjhx.common.service.art.ArtCopyrightService;
+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
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/artCopyright")
+public class ArtCopyrightController {
+
+    @Autowired
+    private ArtCopyrightService artCopyrightService;
+
+    /**
+     * 美术版权分页
+     */
+    @PostMapping("/page")
+    public Page<ArtCopyrightVo> page(@RequestBody ArtCopyrightSelectDto dto) {
+        return artCopyrightService.getPage(dto);
+    }
+
+    /**
+     * 美术版权明细
+     */
+    @PostMapping("/detail")
+    public ArtCopyrightVo detail(@RequestBody BaseSelectDto dto) {
+        return artCopyrightService.detail(dto.getId());
+    }
+
+    /**
+     * 美术版权新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ArtCopyrightDto artCopyrightDto) {
+        artCopyrightService.add(artCopyrightDto);
+    }
+
+    /**
+     * 美术版权编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ArtCopyrightDto artCopyrightDto) {
+        artCopyrightService.edit(artCopyrightDto);
+    }
+
+    /**
+     * 美术版权删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        artCopyrightService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/controller/contractor/ContractorController.java

@@ -0,0 +1,71 @@
+package com.fjhx.common.controller.contractor;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contractor.dto.ContractorDto;
+import com.fjhx.common.entity.contractor.dto.ContractorSelectDto;
+import com.fjhx.common.entity.contractor.vo.ContractorVo;
+import com.fjhx.common.service.contractor.ContractorService;
+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
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/contractor")
+public class ContractorController {
+
+    @Autowired
+    private ContractorService contractorService;
+
+    /**
+     * 承包商分页
+     */
+    @PostMapping("/page")
+    public Page<ContractorVo> page(@RequestBody ContractorSelectDto dto) {
+        return contractorService.getPage(dto);
+    }
+
+    /**
+     * 承包商明细
+     */
+    @PostMapping("/detail")
+    public ContractorVo detail(@RequestBody BaseSelectDto dto) {
+        return contractorService.detail(dto.getId());
+    }
+
+    /**
+     * 承包商新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody ContractorDto contractorDto) {
+        contractorService.add(contractorDto);
+    }
+
+    /**
+     * 承包商编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody ContractorDto contractorDto) {
+        contractorService.edit(contractorDto);
+    }
+
+    /**
+     * 承包商删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        contractorService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/controller/logistics/LogisticsCompanyInfoController.java

@@ -0,0 +1,80 @@
+package com.fjhx.common.controller.logistics;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.logistics.dto.LogisticsCompanyInfoDto;
+import com.fjhx.common.entity.logistics.dto.LogisticsCompanyInfoSelectDto;
+import com.fjhx.common.entity.logistics.vo.LogisticsCompanyInfoVo;
+import com.fjhx.common.service.logistics.LogisticsCompanyInfoService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物流公司信息 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@RestController
+@RequestMapping("/logisticsCompanyInfo")
+public class LogisticsCompanyInfoController {
+
+    @Autowired
+    private LogisticsCompanyInfoService logisticsCompanyInfoService;
+
+    /**
+     * 物流公司信息列表
+     */
+    @PostMapping("/list")
+    public List<LogisticsCompanyInfoVo> list(@RequestBody LogisticsCompanyInfoSelectDto dto) {
+        return logisticsCompanyInfoService.getList(dto);
+    }
+
+    /**
+     * 物流公司信息分页
+     */
+    @PostMapping("/page")
+    public Page<LogisticsCompanyInfoVo> page(@RequestBody LogisticsCompanyInfoSelectDto dto) {
+        return logisticsCompanyInfoService.getPage(dto);
+    }
+
+    /**
+     * 物流公司信息明细
+     */
+    @PostMapping("/detail")
+    public LogisticsCompanyInfoVo detail(@RequestBody BaseSelectDto dto) {
+        return logisticsCompanyInfoService.detail(dto.getId());
+    }
+
+    /**
+     * 物流公司信息新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody LogisticsCompanyInfoDto logisticsCompanyInfoDto) {
+        logisticsCompanyInfoService.add(logisticsCompanyInfoDto);
+    }
+
+    /**
+     * 物流公司信息编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody LogisticsCompanyInfoDto logisticsCompanyInfoDto) {
+        logisticsCompanyInfoService.edit(logisticsCompanyInfoDto);
+    }
+
+    /**
+     * 物流公司信息删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        logisticsCompanyInfoService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/controller/patent/PatentController.java

@@ -0,0 +1,71 @@
+package com.fjhx.common.controller.patent;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.patent.dto.PatentDto;
+import com.fjhx.common.entity.patent.dto.PatentSelectDto;
+import com.fjhx.common.entity.patent.vo.PatentVo;
+import com.fjhx.common.service.patent.PatentService;
+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
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/patent")
+public class PatentController {
+
+    @Autowired
+    private PatentService patentService;
+
+    /**
+     * 专利分页
+     */
+    @PostMapping("/page")
+    public Page<PatentVo> page(@RequestBody PatentSelectDto dto) {
+        return patentService.getPage(dto);
+    }
+
+    /**
+     * 专利明细
+     */
+    @PostMapping("/detail")
+    public PatentVo detail(@RequestBody BaseSelectDto dto) {
+        return patentService.detail(dto.getId());
+    }
+
+    /**
+     * 专利新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody PatentDto patentDto) {
+        patentService.add(patentDto);
+    }
+
+    /**
+     * 专利编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody PatentDto patentDto) {
+        patentService.edit(patentDto);
+    }
+
+    /**
+     * 专利删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        patentService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/controller/trademark/TrademarkController.java

@@ -0,0 +1,71 @@
+package com.fjhx.common.controller.trademark;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.trademark.dto.TrademarkDto;
+import com.fjhx.common.entity.trademark.dto.TrademarkSelectDto;
+import com.fjhx.common.entity.trademark.vo.TrademarkVo;
+import com.fjhx.common.service.trademark.TrademarkService;
+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
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/trademark")
+public class TrademarkController {
+
+    @Autowired
+    private TrademarkService trademarkService;
+
+    /**
+     * 商标分页
+     */
+    @PostMapping("/page")
+    public Page<TrademarkVo> page(@RequestBody TrademarkSelectDto dto) {
+        return trademarkService.getPage(dto);
+    }
+
+    /**
+     * 商标明细
+     */
+    @PostMapping("/detail")
+    public TrademarkVo detail(@RequestBody BaseSelectDto dto) {
+        return trademarkService.detail(dto.getId());
+    }
+
+    /**
+     * 商标新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody TrademarkDto trademarkDto) {
+        trademarkService.add(trademarkDto);
+    }
+
+    /**
+     * 商标编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody TrademarkDto trademarkDto) {
+        trademarkService.edit(trademarkDto);
+    }
+
+    /**
+     * 商标删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        trademarkService.delete(dto.getId());
+    }
+
+}

hx-common/src/main/java/com/fjhx/common/entity/art/dto/ArtCopyrightDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.art.dto;
+
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 美术版权新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ArtCopyrightDto extends ArtCopyright {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/art/dto/ArtCopyrightSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.art.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 美术版权列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ArtCopyrightSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/art/po/ArtCopyright.java

@@ -0,0 +1,27 @@
+package com.fjhx.common.entity.art.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 美术版权
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+@TableName("art_copyright")
+public class ArtCopyright extends BasePo {
+
+    private String code;
+
+    private String name;
+
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/art/vo/ArtCopyrightVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.art.vo;
+
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 美术版权列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ArtCopyrightVo extends ArtCopyright {
+
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
+
+}

hx-sale/src/main/java/com/fjhx/sale/entity/claim/po/ClaimContract.java → hx-common/src/main/java/com/fjhx/common/entity/claim/ClaimContract.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.claim.po;
+package com.fjhx.common.entity.claim;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;

hx-sale/src/main/java/com/fjhx/sale/entity/claim/dto/ClaimContractDto.java → hx-common/src/main/java/com/fjhx/common/entity/claim/dto/ClaimContractDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.claim.dto;
+package com.fjhx.common.entity.claim.dto;
 
-import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.common.entity.claim.ClaimContract;
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/claim/dto/ClaimContractSelectDto.java → hx-common/src/main/java/com/fjhx/common/entity/claim/dto/ClaimContractSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.claim.dto;
+package com.fjhx.common.entity.claim.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-sale/src/main/java/com/fjhx/sale/entity/claim/dto/ClaimDto.java → hx-common/src/main/java/com/fjhx/common/entity/claim/dto/ClaimDto.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.claim.dto;
+package com.fjhx.common.entity.claim.dto;
 
-import com.fjhx.sale.entity.claim.po.Claim;
+import com.fjhx.common.entity.claim.po.Claim;
 import lombok.Getter;
 import lombok.Setter;
 

hx-sale/src/main/java/com/fjhx/sale/entity/claim/dto/ClaimSelectDto.java → hx-common/src/main/java/com/fjhx/common/entity/claim/dto/ClaimSelectDto.java

@@ -1,4 +1,4 @@
-package com.fjhx.sale.entity.claim.dto;
+package com.fjhx.common.entity.claim.dto;
 
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;

hx-sale/src/main/java/com/fjhx/sale/entity/claim/po/Claim.java → hx-common/src/main/java/com/fjhx/common/entity/claim/po/Claim.java

@@ -1,16 +1,17 @@
-package com.fjhx.sale.entity.claim.po;
+package com.fjhx.common.entity.claim.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fjhx.common.entity.claim.ClaimContract;
 import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
-import lombok.Getter;
-import lombok.Setter;
-
 /**
  * <p>
  * 到账认领
@@ -67,6 +68,9 @@ public class Claim extends BasePo {
      */
     private Date claimTime;
 
+    private Integer confirmStatus;
+    //=========================
+
     /**
      * 到账认领合同列表
      */

hx-sale/src/main/java/com/fjhx/sale/entity/claim/vo/ClaimContractVo.java → hx-common/src/main/java/com/fjhx/common/entity/claim/vo/ClaimContractVo.java

@@ -1,6 +1,6 @@
-package com.fjhx.sale.entity.claim.vo;
+package com.fjhx.common.entity.claim.vo;
 
-import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.common.entity.claim.ClaimContract;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,12 +18,17 @@ public class ClaimContractVo extends ClaimContract {
     /**
      * 认领人ID
      */
-    private  Long claimUserId;
+    private Long claimUserId;
 
     /**
      * 认领人名称
      */
-    private  String claimUserName;
+    private String claimUserName;
+
+    /**
+     * 合同号
+     */
+    private String contractCode;
 
 
 }

hx-sale/src/main/java/com/fjhx/sale/entity/claim/vo/ClaimVo.java → hx-common/src/main/java/com/fjhx/common/entity/claim/vo/ClaimVo.java

@@ -1,11 +1,10 @@
-package com.fjhx.sale.entity.claim.vo;
+package com.fjhx.common.entity.claim.vo;
 
-import com.fjhx.sale.entity.claim.po.Claim;
-import com.fjhx.sale.entity.claim.po.ClaimContract;
+import com.fjhx.common.entity.claim.ClaimContract;
+import com.fjhx.common.entity.claim.po.Claim;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**

hx-common/src/main/java/com/fjhx/common/entity/contractor/dto/ContractorDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.contractor.dto;
+
+import com.fjhx.common.entity.contractor.po.Contractor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 承包商新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ContractorDto extends Contractor {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contractor/dto/ContractorSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.contractor.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 承包商列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ContractorSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contractor/po/Contractor.java

@@ -0,0 +1,56 @@
+package com.fjhx.common.entity.contractor.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 承包商
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+@TableName("contractor")
+public class Contractor extends BasePo {
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 编号
+     */
+    private String code;
+
+    /**
+     * 账户名称
+     */
+    private String accountName;
+
+    /**
+     * 账户开户行
+     */
+    private String accountBank;
+
+    /**
+     * 账户账号
+     */
+    private String accountNumber;
+
+    /**
+     * 税点
+     */
+    private String taxPoints;
+
+    /**
+     * 归属公司
+     */
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/contractor/vo/ContractorVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.contractor.vo;
+
+import com.fjhx.common.entity.contractor.po.Contractor;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 承包商列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class ContractorVo extends Contractor {
+
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/logistics/dto/LogisticsCompanyInfoDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.logistics.dto;
+
+import com.fjhx.common.entity.logistics.po.LogisticsCompanyInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 物流公司信息新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class LogisticsCompanyInfoDto extends LogisticsCompanyInfo {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/logistics/dto/LogisticsCompanyInfoSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.logistics.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 物流公司信息列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class LogisticsCompanyInfoSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/logistics/po/LogisticsCompanyInfo.java

@@ -0,0 +1,68 @@
+package com.fjhx.common.entity.logistics.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 物流公司信息
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+@TableName("logistics_company_info")
+public class LogisticsCompanyInfo extends BasePo {
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 类型
+     */
+    private String type;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 税点
+     */
+    private BigDecimal taxPoints;
+
+    /**
+     * 开户名
+     */
+    private String accountName;
+
+    /**
+     * 开户行
+     */
+    private String accountBank;
+
+    /**
+     * 开户账号
+     */
+    private String accountNumber;
+
+    /**
+     * 归属公司
+     */
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/logistics/vo/LogisticsCompanyInfoVo.java

@@ -0,0 +1,28 @@
+package com.fjhx.common.entity.logistics.vo;
+
+import com.fjhx.common.entity.logistics.po.LogisticsCompanyInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 物流公司信息列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-18
+ */
+@Getter
+@Setter
+public class LogisticsCompanyInfoVo extends LogisticsCompanyInfo {
+
+    /**
+     * 预付款结存
+     */
+    private BigDecimal balancePrepaid;
+    /**
+     * 预付款结存(含税)
+     */
+    private BigDecimal balancePrepaidTax;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/patent/dto/PatentDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.patent.dto;
+
+import com.fjhx.common.entity.patent.po.Patent;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 专利新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class PatentDto extends Patent {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/patent/dto/PatentSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.patent.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 专利列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class PatentSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/patent/po/Patent.java

@@ -0,0 +1,27 @@
+package com.fjhx.common.entity.patent.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 专利
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+@TableName("patent")
+public class Patent extends BasePo {
+
+    private String code;
+
+    private String name;
+
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/patent/vo/PatentVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.patent.vo;
+
+import com.fjhx.common.entity.patent.po.Patent;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 专利列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class PatentVo extends Patent {
+
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/trademark/dto/TrademarkDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.trademark.dto;
+
+import com.fjhx.common.entity.trademark.po.Trademark;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商标新增编辑入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class TrademarkDto extends Trademark {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/trademark/dto/TrademarkSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.common.entity.trademark.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商标列表查询入参实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class TrademarkSelectDto extends BaseSelectDto {
+
+}

hx-common/src/main/java/com/fjhx/common/entity/trademark/po/Trademark.java

@@ -0,0 +1,27 @@
+package com.fjhx.common.entity.trademark.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 商标
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+@TableName("trademark")
+public class Trademark extends BasePo {
+
+    private String code;
+
+    private String name;
+
+    private Long companyId;
+
+}

hx-common/src/main/java/com/fjhx/common/entity/trademark/vo/TrademarkVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.common.entity.trademark.vo;
+
+import com.fjhx.common.entity.trademark.po.Trademark;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 商标列表查询返回值实体
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Getter
+@Setter
+public class TrademarkVo extends Trademark {
+
+    /**
+     * 归属公司名称
+     */
+    private String companyName;
+
+}

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

@@ -84,6 +84,32 @@ public enum CodingRuleEnum {
             getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
             getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
     )),
+    /**
+     * 装箱出货
+     */
+    PACK("pack", "装箱出货", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "PACK-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+
+    /**
+     * 费控
+     */
+    COST_CONTROL("cost_control", "费控", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "COST-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
+
+    /**
+     * 费控
+     */
+    SALE_OUTBOUND("sale_outbound", "费控", Arrays.asList(
+            getDefaultRule(RuleTypeEnum.CUSTOMIZE, "SO-"),
+            getDefaultRule(RuleTypeEnum.DATE_FORMAT, "yyyyMM-"),
+            getDefaultRule(RuleTypeEnum.AUTOINCREMENT, "3")
+    )),
     ;
 
 

hx-common/src/main/java/com/fjhx/common/mapper/art/ArtCopyrightMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.art;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 美术版权 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface ArtCopyrightMapper extends BaseMapper<ArtCopyright> {
+
+    /**
+     * 美术版权分页
+     */
+    Page<ArtCopyrightVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ArtCopyright> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/contractor/ContractorMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.contractor;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.contractor.po.Contractor;
+import com.fjhx.common.entity.contractor.vo.ContractorVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 承包商 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface ContractorMapper extends BaseMapper<Contractor> {
+
+    /**
+     * 承包商分页
+     */
+    Page<ContractorVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Contractor> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/logistics/LogisticsCompanyInfoMapper.java

@@ -0,0 +1,32 @@
+package com.fjhx.common.mapper.logistics;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.logistics.po.LogisticsCompanyInfo;
+import com.fjhx.common.entity.logistics.vo.LogisticsCompanyInfoVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物流公司信息 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-18
+ */
+public interface LogisticsCompanyInfoMapper extends BaseMapper<LogisticsCompanyInfo> {
+
+    /**
+     * 物流公司信息列表
+     */
+    List<LogisticsCompanyInfoVo> getList(@Param("ew") IWrapper<LogisticsCompanyInfo> wrapper);
+
+    /**
+     * 物流公司信息分页
+     */
+    Page<LogisticsCompanyInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<LogisticsCompanyInfo> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/patent/PatentMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.patent;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.patent.po.Patent;
+import com.fjhx.common.entity.patent.vo.PatentVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 专利 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface PatentMapper extends BaseMapper<Patent> {
+
+    /**
+     * 专利分页
+     */
+    Page<PatentVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Patent> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/mapper/trademark/TrademarkMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.common.mapper.trademark;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.trademark.po.Trademark;
+import com.fjhx.common.entity.trademark.vo.TrademarkVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 商标 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface TrademarkMapper extends BaseMapper<Trademark> {
+
+    /**
+     * 商标分页
+     */
+    Page<TrademarkVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Trademark> wrapper);
+
+}

hx-common/src/main/java/com/fjhx/common/service/art/ArtCopyrightService.java

@@ -0,0 +1,46 @@
+package com.fjhx.common.service.art;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.common.entity.art.dto.ArtCopyrightDto;
+import com.fjhx.common.entity.art.dto.ArtCopyrightSelectDto;
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 美术版权 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+public interface ArtCopyrightService extends BaseService<ArtCopyright> {
+
+    /**
+     * 美术版权分页
+     */
+    Page<ArtCopyrightVo> getPage(ArtCopyrightSelectDto dto);
+
+    /**
+     * 美术版权明细
+     */
+    ArtCopyrightVo detail(Long id);
+
+    /**
+     * 美术版权新增
+     */
+    void add(ArtCopyrightDto artCopyrightDto);
+
+    /**
+     * 美术版权编辑
+     */
+    void edit(ArtCopyrightDto artCopyrightDto);
+
+    /**
+     * 美术版权删除
+     */
+    void delete(Long id);
+
+}

hx-common/src/main/java/com/fjhx/common/service/art/impl/ArtCopyrightServiceImpl.java

@@ -0,0 +1,88 @@
+package com.fjhx.common.service.art.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.common.entity.art.dto.ArtCopyrightDto;
+import com.fjhx.common.entity.art.dto.ArtCopyrightSelectDto;
+import com.fjhx.common.entity.art.po.ArtCopyright;
+import com.fjhx.common.entity.art.vo.ArtCopyrightVo;
+import com.fjhx.common.mapper.art.ArtCopyrightMapper;
+import com.fjhx.common.service.art.ArtCopyrightService;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+/**
+ * <p>
+ * 美术版权 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-03-24
+ */
+@Service
+public class ArtCopyrightServiceImpl extends ServiceImpl<ArtCopyrightMapper, ArtCopyright> implements ArtCopyrightService {
+
+    @Autowired
+    private ISysDeptService deptService;
+
+    @Override
+    public Page<ArtCopyrightVo> getPage(ArtCopyrightSelectDto dto) {
+        IWrapper<ArtCopyright> wrapper = getWrapper();
+
+        //关键字检索
+        wrapper.keyword(dto.getKeyword(), new SqlField("ac", ArtCopyright::getName), new SqlField("ac", ArtCopyright::getCode));
+        wrapper.orderByDesc("ac", ArtCopyright::getCreateTime);
+
+        wrapper.orderByDesc("ac", ArtCopyright::getId);
+        Page<ArtCopyrightVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<ArtCopyrightVo> records = page.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return page;
+        }
+
+        //获取归属公司信息
+        Map<Long, String> deptMap = deptService.list().stream().collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+
+        //赋值数据
+        for (ArtCopyrightVo record : records) {
+            //赋值归属公司信息
+            record.setCompanyName(deptMap.get(record.getCompanyId()));
+        }
+
+        return page;
+    }
+
+    @Override
+    public ArtCopyrightVo detail(Long id) {
+        ArtCopyright ArtCopyright = this.getById(id);
+        ArtCopyrightVo result = BeanUtil.toBean(ArtCopyright, ArtCopyrightVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(ArtCopyrightDto artCopyrightDto) {
+        this.save(artCopyrightDto);
+    }
+
+    @Override
+    public void edit(ArtCopyrightDto artCopyrightDto) {
+        this.updateById(artCopyrightDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}