b10eaf44249ab441e6f058d037861ae97daf77fd..c6040880b0da8834dbcb92d6def7d4dd0cd6c40e
2026-04-29 cuida
feat:合同,合同标的物,收款基础代码
c60408 对比 | 目录
2026-04-29 cuida
feat:合同,合同标的物,收款实体
fd60f7 对比 | 目录
2026-04-29 shiyunteng
feat:删除配置文件多余配置
487152 对比 | 目录
2026-04-29 cuida
feat:修改
7dd09c 对比 | 目录
2个文件已修改
18个文件已添加
984 ■■■■■ 已修改文件
platformx-boot/src/main/resources/application-dev.yml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java 165 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/App.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractPaymentScheduleController.java 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractPaymentScheduleMapper.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterMapper.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractPaymentScheduleService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/resources/mapper/ContractPaymentScheduleMapper.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterMapper.xml 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platformx-boot/src/main/resources/application-dev.yml
@@ -2,6 +2,7 @@
  data:
    redis:
      host: 127.0.0.1
      password: 123456
      database: 0
  # 数据库相关配置
  datasource:
@@ -36,9 +37,3 @@
# swagger 配置
swagger:
  token-url: ${swagger.gateway}/admin/oauth2/token
easy-es:
  compatible: true # 兼容模式开关,默认为false,若您的es客户端版本小于8.x,务必设置为true才可正常使用,8.x及以上则可忽略此项配置
  enable: true #默认为true,若为false则认为不启用本框架
  address : 192.168.0.7:9200 # es的连接地址,必须含端口 若为集群,则可以用逗号隔开 例如:127.0.0.1:9200,127.0.0.2:9200
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
New file
@@ -0,0 +1,123 @@
package com.by4cloud.platformx.business.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import lombok.Data;
import org.hibernate.annotations.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * @author cd
 * @description
 * @date 2026/4/29 10:51
 **/
@Data
@Entity
@Table(appliesTo = "contract", comment = "合同管理")
public class Contract extends BaseModel<Contract> {
    @Schema(description = "合同编号")
    @Column(columnDefinition = "VARCHAR(64) comment '合同编号'")
    private String contractNo;
    @Schema(description = "合同名称")
    @Column(columnDefinition = "VARCHAR(200) comment '合同名称'")
    private String contractName;
    @Schema(description = "甲方id")
    @Column(columnDefinition = "bigint comment '甲方id'")
    private Long partyAId;
    @Schema(description = "甲方名称")
    @Column(columnDefinition = "VARCHAR(100) comment '甲方名称'")
    private String partyA;
    @Schema(description = "乙方id")
    @Column(columnDefinition = "VARCHAR(100) comment '乙方id'")
    private String partyBId;
    @Schema(description = "乙方名称")
    @Column(columnDefinition = "VARCHAR(100) comment '乙方名称'")
    private String partyB;
    @Schema(description = "合同金额")
    @Column(columnDefinition = "double comment '合同金额'")
    private Double amount;
    @Schema(description = "币种(CNY/USD等)")
    @Column(columnDefinition = "VARCHAR(10) default 'CNY' comment '币种'")
    private String currency;
    @Schema(description = "合同类型(0-生成式 1-备案式)")
    @Column(columnDefinition = "tinyint(2) default 0 comment '合同类型'")
    private Integer contractType;
    @Schema(description = "合同状态(0-草稿 1-已生效 2-已终止 3-已过期)")
    @Column(columnDefinition = "tinyint(2) default 0 comment '合同状态'")
    private Integer contractStatus;
    @Schema(description = "合同服务属性(0-产品销售 1-无形服务)")
    @Column(columnDefinition = "tinyint(2) default 0 comment '合同服务属性'")
    private Integer contractAttribute;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Schema(description = "签署日期")
    @Column(columnDefinition = "VARCHAR(64) comment '签署日期'")
    private String signDate;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Schema(description = "生效日期")
    @Column(columnDefinition = "VARCHAR(64) comment '生效日期'")
    private String effectiveDate;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Schema(description = "到期日期")
    @Column(columnDefinition = "VARCHAR(64) comment '到期日期'")
    private String expirationDate;
    @Schema(description = "合同附件URL")
    @Column(columnDefinition = "VARCHAR(500) comment '合同附件URL'")
    private String attachmentUrl;
    @Schema(description = "备注")
    @Column(columnDefinition = "TEXT comment '备注'")
    private String remark;
    @Schema(description = "关联父合同id(用于合同变更时指向原合同)")
    @Column(columnDefinition = "bigint comment '关联父合同id'")
    private Long parentId;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Schema(description = "审批时间")
    @Column(columnDefinition = "datetime comment '审批时间'")
    private String approveTime;
    /**
     * 临时字段 - 用于接收审批人名称等关联查询结果
     */
    @Transient
    @TableField(exist = false)
    private String approverName;
    /**
     * 临时字段 - 合同剩余天数
     */
    @Transient
    @TableField(exist = false)
    @Schema(description = "合同剩余天数(临时字段)")
    private Long remainingDays;
}
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java
New file
@@ -0,0 +1,165 @@
package com.by4cloud.platformx.business.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Transient;
import lombok.Data;
import org.hibernate.annotations.Table;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
/**
 * 合同收款计划/履约节点实体类
 * 统一管理合同的收款阶段、履约节点、收款比例及履约时间节点
 *
 * @author xfei
 * @date 2024-01-15
 */
@Data
@Entity
@Table(appliesTo = "contract_payment_schedule", comment = "合同收款计划/履约节点表")
public class ContractPaymentSchedule extends BaseModel<ContractPaymentSchedule> {
    // ==================== 关联信息 ====================
    @Schema(description = "关联合同ID")
    @Column(columnDefinition = "bigint not null comment '关联合同ID'")
    private Long contractId;
    @Schema(description = "合同名称")
    @Column(columnDefinition = "VARCHAR(64) comment '合同名称'")
    private String contractName;
    @Schema(description = "关联标的物ID(可选,如果为空则适用于合同整体)")
    @Column(columnDefinition = "bigint comment '关联标的物ID'")
    private Long subjectMatterId;
    @Schema(description = "标的物名称")
    @Column(columnDefinition = "VARCHAR(64) comment '标的物名称'")
    private String subjectMatterName;
    // ==================== 收款阶段/履约节点基本信息 ====================
//    @Schema(description = "收款阶段/节点编码(如:STAGE_001)")
//    @Column(columnDefinition = "VARCHAR(64) comment '收款阶段/节点编码'")
//    private String stageCode;
    @Schema(description = "收款阶段名称(显性要素,如:合同签订预付、发货前付款、货到签收付款、调试完成付款、质保金)")
    @Column(columnDefinition = "VARCHAR(100) not null comment '收款阶段名称'")
    private String stageName;
//    @Schema(description = "节点类型(0-标准预定义节点 1-自定义节点)")
//    @Column(columnDefinition = "tinyint(1) default 0 comment '节点类型'")
//    private Integer nodeType;
//    @Schema(description = "履约节点编码(与收款阶段关联的履约节点,如:SIGN、PRE_DELIVERY、DELIVERY_RECEIPT、COMMISSIONING、WARRANTY)")
//    @Column(columnDefinition = "VARCHAR(50) comment '履约节点编码'")
//    private String fulfillmentNodeCode;
//    @Schema(description = "履约节点名称")
//    @Column(columnDefinition = "VARCHAR(100) comment '履约节点名称'")
//    private String fulfillmentNodeName;
    // ==================== 收款比例/金额 ====================
    @Schema(description = "收款比例(%,如30表示30%)(显性要素)")
    @Column(columnDefinition = "double comment '收款比例(%)'")
    private Double paymentRatio;
    @Schema(description = "计划收款金额(根据合同总金额*比例自动计算)")
    @Column(columnDefinition = "double comment '计划收款金额'")
    private Double plannedAmount;
    @Schema(description = "实际收款金额")
    @Column(columnDefinition = "double default 0.00 comment '实际收款金额'")
    private Double actualAmount;
    // ==================== 时序控制 ====================
    @Schema(description = "阶段顺序(第几期)")
    @Column(columnDefinition = "int not null comment '阶段顺序'")
    private Integer stageOrder;
    @Schema(description = "计划收款日期(基于合同签订日期+约定天数计算)")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Column(columnDefinition = "VARCHAR(64) comment '计划收款日期'")
    private String plannedPaymentDate;
    @Schema(description = "收款阶段生效日期(隐性要素 - 履约时间起点,即该节点实际达成的日期)")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Column(columnDefinition = "VARCHAR(64) comment '收款阶段生效日期(履约节点实际达成日期)'")
    private String effectiveDate;
    @Schema(description = "约定天数(合同签订后X天内付款/货到后X天内付款等)")
    @Column(columnDefinition = "int default 0 comment '约定天数'")
    private Integer agreedDays;
    @Schema(description = "天数计算基准(0-合同签订日 1-上一节点生效日 2-货到日 3-验收日)")
    @Column(columnDefinition = "tinyint(1) default 0 comment '天数计算基准'")
    private Integer calculationBasis;
    // ==================== 状态控制 ====================
    @Schema(description = "履约节点状态(0-未开始 1-进行中 2-已达成 3-已逾期)")
    @Column(columnDefinition = "tinyint(1) default 0 comment '履约节点状态'")
    private Integer fulfillmentStatus;
    @Schema(description = "收款状态(0-未收款 1-部分收款 2-已收款 3-逾期)")
    @Column(columnDefinition = "tinyint(1) default 0 comment '收款状态'")
    private Integer paymentStatus;
//    @Schema(description = "是否自动触发(0-手动录入节点时间 1-系统自动获取节点时间)")
//    @Column(columnDefinition = "tinyint(1) default 0 comment '是否自动触发'")
//    private Integer isAutoTrigger;
    // ==================== 关联单据(用于系统自动获取节点时间) ====================
//    @Schema(description = "关联单据类型(0-无 1-调试单 2-验收单 3-发货单 4-签收单)")
//    @Column(columnDefinition = "tinyint(2) comment '关联单据类型'")
//    private Integer relatedDocType;
//
//    @Schema(description = "关联单据ID(如调试单ID、验收单ID等)")
//    @Column(columnDefinition = "bigint comment '关联单据ID'")
//    private Long relatedDocId;
//
//    @Schema(description = "关联单据编号")
//    @Column(columnDefinition = "VARCHAR(64) comment '关联单据编号'")
//    private String relatedDocNo;
    // ==================== 发票关联 ====================
//    @Schema(description = "关联发票ID")
//    @Column(columnDefinition = "bigint comment '关联发票ID'")
//    private Long invoiceId;
//
//    @Schema(description = "是否已开票(0-未开票 1-已开票)")
//    @Column(columnDefinition = "tinyint(1) default 0 comment '是否已开票'")
//    private Integer isInvoiced;
    // ==================== 业务扩展 ====================
    @Schema(description = "备注")
    @Column(columnDefinition = "VARCHAR(500) comment '备注'")
    private String remark;
//    @Schema(description = "排序号")
//    @Column(columnDefinition = "int default 0 comment '排序号'")
//    private Integer sortOrder;
    // ==================== 临时字段(用于查询展示) ====================
//    @Transient
//    @TableField(exist = false)
//    @Schema(description = "逾期天数(临时字段)")
//    private Long overdueDays;
}
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
New file
@@ -0,0 +1,141 @@
package com.by4cloud.platformx.business.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Transient;
import lombok.Data;
import org.hibernate.annotations.Table;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
/**
 * 合同标的物明细实体类
 * @author xfei
 * @date 2024-01-15
 */
@Data
@Entity
@Table(appliesTo = "contract_subject_matter", comment = "合同标的物明细表")
public class ContractSubjectMatter extends BaseModel<ContractSubjectMatter> {
    @Schema(description = "关联合同ID")
    @Column(columnDefinition = "bigint comment '关联合同ID'")
    private Long contractId;
    @Schema(description = "合同名称")
    @Column(columnDefinition = "VARCHAR(200) comment '合同名称'")
    private String contractName;
    @Schema(description = "标的物名称")
    @Column(columnDefinition = "VARCHAR(200) comment '标的物名称'")
    private String materialName;
    @Schema(description = "标的物编码(内部唯一编码)")
    @Column(columnDefinition = "VARCHAR(64) comment '标的物编码'")
    private String materialCode;
    @Schema(description = "标的物编码(内部唯一名称)")
    @Column(columnDefinition = "VARCHAR(64) comment '标的物名称(内部)'")
    private String materialInternalName;
    @Schema(description = "标的物规格/型号")
    @Column(columnDefinition = "VARCHAR(200) comment '标的物规格/型号'")
    private String specification;
    @Schema(description = "标的物品牌")
    @Column(columnDefinition = "VARCHAR(100) comment '标的物品牌'")
    private String brand;
    @Schema(description = "标的物分类(0-产品 1-服务)")
    @Column(columnDefinition = "tinyint(2) default 0 comment '标的物分类'")
    private Integer category;
    @Schema(description = "数量")
    @Column(columnDefinition = "double comment '数量'")
    private Double quantity;
    @Schema(description = "计量单位(个/台/吨/项/套等)")
    @Column(columnDefinition = "VARCHAR(20) comment '计量单位'")
    private String unit;
    @Schema(description = "单价")
    @Column(columnDefinition = "double comment '单价'")
    private Double unitPrice;
    @Schema(description = "税率(百分比,如13表示13%)")
    @Column(columnDefinition = "double default 0.00 comment '税率'")
    private Double taxRate;
    @Schema(description = "税额")
    @Column(columnDefinition = "double default 0.00 comment '税额'")
    private Double taxAmount;
    @Schema(description = "含税总价")
    @Column(columnDefinition = "double comment '含税总价'")
    private Double totalAmount;
    @Schema(description = "不含税总价")
    @Column(columnDefinition = "double comment '不含税总价'")
    private Double totalAmountExcludingTax;
    @Schema(description = "交货/交付地点")
    @Column(columnDefinition = "VARCHAR(500) comment '交货/交付地点'")
    private String deliveryPlace;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Schema(description = "计划交付日期")
    @Column(columnDefinition = "datetime comment '计划交付日期'")
    private Date plannedDeliveryDate;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Schema(description = "实际交付日期")
    @Column(columnDefinition = "datetime comment '实际交付日期'")
    private Date actualDeliveryDate;
    @Schema(description = "交付状态(0-未交付 1-部分交付 2-已交付 3-逾期)")
    @Column(columnDefinition = "tinyint(2) default 0 comment '交付状态'")
    private Integer deliveryStatus;
    @Schema(description = "质保期(月)")
    @Column(columnDefinition = "int default 12 comment '质保期(月)'")
    private Integer warrantyPeriod;
    @Schema(description = "标的物描述/备注")
    @Column(columnDefinition = "TEXT comment '标的物描述/备注'")
    private String description;
    @Schema(description = "附件URL(产品说明书、技术文档等)")
    @Column(columnDefinition = "VARCHAR(500) comment '附件URL'")
    private String attachmentUrl;
    @Schema(description = "排序号")
    @Column(columnDefinition = "int default 0 comment '排序号'")
    private Integer sortOrder;
    @Schema(description = "是否验收通过(0-未验收 1-已验收)")
    @Column(columnDefinition = "tinyint(1) default 0 comment '是否验收通过'")
    private Integer isAccepted;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
    @Schema(description = "验收时间")
    @Column(columnDefinition = "datetime comment '验收时间'")
    private Date acceptTime;
    /**
     * 临时字段 - 已交付数量(用于交付进度统计)
     */
    @Transient
    @TableField(exist = false)
    @Schema(description = "已交付数量(临时字段)")
    private BigDecimal deliveredQuantity;
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/App.java
@@ -12,7 +12,7 @@
 * <p>
 * 项目启动类
 */
@EnableOpenApi("platformx-kjpt")
@EnableOpenApi("platformx-ycyt")
@EnablePlatformxFeignClients
@EnableDiscoveryClient
@EnablePlatformxResourceServer
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
New file
@@ -0,0 +1,119 @@
package com.by4cloud.platformx.business.controller;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.service.ContractService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import org.springdoc.core.annotations.ParameterObject;
import org.springframework.http.HttpHeaders;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
/**
 * 合同管理
 *
 * @author platformx
 * @date 2026-04-29 16:46:26
 */
@RestController
@RequiredArgsConstructor
@RequestMapping("/contract" )
@Tag(description = "contract" , name = "合同管理管理" )
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class ContractController {
    private final  ContractService contractService;
    /**
     * 分页查询
     * @param page 分页对象
     * @param contract 合同管理
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('business_contract_view')" )
    public R getContractPage(@ParameterObject Page page, @ParameterObject Contract contract) {
        LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
        return R.ok(contractService.page(page, wrapper));
    }
    /**
     * 通过id查询合同管理
     * @param id id
     * @return R
     */
    @Operation(summary = "通过id查询" , description = "通过id查询" )
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('business_contract_view')" )
    public R getById(@PathVariable("id" ) Long id) {
        return R.ok(contractService.getById(id));
    }
    /**
     * 新增合同管理
     * @param contract 合同管理
     * @return R
     */
    @Operation(summary = "新增合同管理" , description = "新增合同管理" )
    @SysLog("新增合同管理" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('business_contract_add')" )
    public R save(@RequestBody Contract contract) {
        return R.ok(contractService.save(contract));
    }
    /**
     * 修改合同管理
     * @param contract 合同管理
     * @return R
     */
    @Operation(summary = "修改合同管理" , description = "修改合同管理" )
    @SysLog("修改合同管理" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('business_contract_edit')" )
    public R updateById(@RequestBody Contract contract) {
        return R.ok(contractService.updateById(contract));
    }
    /**
     * 通过id删除合同管理
     * @param ids id列表
     * @return R
     */
    @Operation(summary = "通过id删除合同管理" , description = "通过id删除合同管理" )
    @SysLog("通过id删除合同管理" )
    @DeleteMapping
    @PreAuthorize("@pms.hasPermission('business_contract_del')" )
    public R removeById(@RequestBody Long[] ids) {
        return R.ok(contractService.removeBatchByIds(CollUtil.toList(ids)));
    }
    /**
     * 导出excel 表格
     * @param contract 查询条件
        * @param ids 导出指定ID
     * @return excel 文件流
     */
    @ResponseExcel
    @GetMapping("/export")
    @PreAuthorize("@pms.hasPermission('business_contract_export')" )
    public List<Contract> export(Contract contract,Long[] ids) {
        return contractService.list(Wrappers.lambdaQuery(contract).in(ArrayUtil.isNotEmpty(ids), Contract::getId, ids));
    }
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractPaymentScheduleController.java
New file
@@ -0,0 +1,119 @@
package com.by4cloud.platformx.business.controller;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import org.springdoc.core.annotations.ParameterObject;
import org.springframework.http.HttpHeaders;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
/**
 * 合同收款计划/履约节点表
 *
 * @author platformx
 * @date 2026-04-29 16:37:26
 */
@RestController
@RequiredArgsConstructor
@RequestMapping("/contractPaymentSchedule" )
@Tag(description = "contractPaymentSchedule" , name = "合同收款计划/履约节点表管理" )
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class ContractPaymentScheduleController {
    private final  ContractPaymentScheduleService contractPaymentScheduleService;
    /**
     * 分页查询
     * @param page 分页对象
     * @param contractPaymentSchedule 合同收款计划/履约节点表
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('business_contractPaymentSchedule_view')" )
    public R getContractPaymentSchedulePage(@ParameterObject Page page, @ParameterObject ContractPaymentSchedule contractPaymentSchedule) {
        LambdaQueryWrapper<ContractPaymentSchedule> wrapper = Wrappers.lambdaQuery();
        return R.ok(contractPaymentScheduleService.page(page, wrapper));
    }
    /**
     * 通过id查询合同收款计划/履约节点表
     * @param id id
     * @return R
     */
    @Operation(summary = "通过id查询" , description = "通过id查询" )
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('business_contractPaymentSchedule_view')" )
    public R getById(@PathVariable("id" ) Long id) {
        return R.ok(contractPaymentScheduleService.getById(id));
    }
    /**
     * 新增合同收款计划/履约节点表
     * @param contractPaymentSchedule 合同收款计划/履约节点表
     * @return R
     */
    @Operation(summary = "新增合同收款计划/履约节点表" , description = "新增合同收款计划/履约节点表" )
    @SysLog("新增合同收款计划/履约节点表" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('business_contractPaymentSchedule_add')" )
    public R save(@RequestBody ContractPaymentSchedule contractPaymentSchedule) {
        return R.ok(contractPaymentScheduleService.save(contractPaymentSchedule));
    }
    /**
     * 修改合同收款计划/履约节点表
     * @param contractPaymentSchedule 合同收款计划/履约节点表
     * @return R
     */
    @Operation(summary = "修改合同收款计划/履约节点表" , description = "修改合同收款计划/履约节点表" )
    @SysLog("修改合同收款计划/履约节点表" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('business_contractPaymentSchedule_edit')" )
    public R updateById(@RequestBody ContractPaymentSchedule contractPaymentSchedule) {
        return R.ok(contractPaymentScheduleService.updateById(contractPaymentSchedule));
    }
    /**
     * 通过id删除合同收款计划/履约节点表
     * @param ids id列表
     * @return R
     */
    @Operation(summary = "通过id删除合同收款计划/履约节点表" , description = "通过id删除合同收款计划/履约节点表" )
    @SysLog("通过id删除合同收款计划/履约节点表" )
    @DeleteMapping
    @PreAuthorize("@pms.hasPermission('business_contractPaymentSchedule_del')" )
    public R removeById(@RequestBody Long[] ids) {
        return R.ok(contractPaymentScheduleService.removeBatchByIds(CollUtil.toList(ids)));
    }
    /**
     * 导出excel 表格
     * @param contractPaymentSchedule 查询条件
        * @param ids 导出指定ID
     * @return excel 文件流
     */
    @ResponseExcel
    @GetMapping("/export")
    @PreAuthorize("@pms.hasPermission('business_contractPaymentSchedule_export')" )
    public List<ContractPaymentSchedule> export(ContractPaymentSchedule contractPaymentSchedule,Long[] ids) {
        return contractPaymentScheduleService.list(Wrappers.lambdaQuery(contractPaymentSchedule).in(ArrayUtil.isNotEmpty(ids), ContractPaymentSchedule::getId, ids));
    }
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractSubjectMatterController.java
New file
@@ -0,0 +1,119 @@
package com.by4cloud.platformx.business.controller;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
import org.springframework.security.access.prepost.PreAuthorize;
import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import org.springdoc.core.annotations.ParameterObject;
import org.springframework.http.HttpHeaders;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Objects;
/**
 * 合同标的物明细表
 *
 * @author platformx
 * @date 2026-04-29 16:39:29
 */
@RestController
@RequiredArgsConstructor
@RequestMapping("/contractSubjectMatter" )
@Tag(description = "contractSubjectMatter" , name = "合同标的物明细表管理" )
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
public class ContractSubjectMatterController {
    private final  ContractSubjectMatterService contractSubjectMatterService;
    /**
     * 分页查询
     * @param page 分页对象
     * @param contractSubjectMatter 合同标的物明细表
     * @return
     */
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('business_contractSubjectMatter_view')" )
    public R getContractSubjectMatterPage(@ParameterObject Page page, @ParameterObject ContractSubjectMatter contractSubjectMatter) {
        LambdaQueryWrapper<ContractSubjectMatter> wrapper = Wrappers.lambdaQuery();
        return R.ok(contractSubjectMatterService.page(page, wrapper));
    }
    /**
     * 通过id查询合同标的物明细表
     * @param id id
     * @return R
     */
    @Operation(summary = "通过id查询" , description = "通过id查询" )
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('business_contractSubjectMatter_view')" )
    public R getById(@PathVariable("id" ) Long id) {
        return R.ok(contractSubjectMatterService.getById(id));
    }
    /**
     * 新增合同标的物明细表
     * @param contractSubjectMatter 合同标的物明细表
     * @return R
     */
    @Operation(summary = "新增合同标的物明细表" , description = "新增合同标的物明细表" )
    @SysLog("新增合同标的物明细表" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('business_contractSubjectMatter_add')" )
    public R save(@RequestBody ContractSubjectMatter contractSubjectMatter) {
        return R.ok(contractSubjectMatterService.save(contractSubjectMatter));
    }
    /**
     * 修改合同标的物明细表
     * @param contractSubjectMatter 合同标的物明细表
     * @return R
     */
    @Operation(summary = "修改合同标的物明细表" , description = "修改合同标的物明细表" )
    @SysLog("修改合同标的物明细表" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('business_contractSubjectMatter_edit')" )
    public R updateById(@RequestBody ContractSubjectMatter contractSubjectMatter) {
        return R.ok(contractSubjectMatterService.updateById(contractSubjectMatter));
    }
    /**
     * 通过id删除合同标的物明细表
     * @param ids id列表
     * @return R
     */
    @Operation(summary = "通过id删除合同标的物明细表" , description = "通过id删除合同标的物明细表" )
    @SysLog("通过id删除合同标的物明细表" )
    @DeleteMapping
    @PreAuthorize("@pms.hasPermission('business_contractSubjectMatter_del')" )
    public R removeById(@RequestBody Long[] ids) {
        return R.ok(contractSubjectMatterService.removeBatchByIds(CollUtil.toList(ids)));
    }
    /**
     * 导出excel 表格
     * @param contractSubjectMatter 查询条件
        * @param ids 导出指定ID
     * @return excel 文件流
     */
    @ResponseExcel
    @GetMapping("/export")
    @PreAuthorize("@pms.hasPermission('business_contractSubjectMatter_export')" )
    public List<ContractSubjectMatter> export(ContractSubjectMatter contractSubjectMatter,Long[] ids) {
        return contractSubjectMatterService.list(Wrappers.lambdaQuery(contractSubjectMatter).in(ArrayUtil.isNotEmpty(ids), ContractSubjectMatter::getId, ids));
    }
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractMapper.java
New file
@@ -0,0 +1,12 @@
package com.by4cloud.platformx.business.mapper;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
 * @author 28254
 */
@Mapper
public interface ContractMapper extends PlatformxBaseMapper<Contract> {
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractPaymentScheduleMapper.java
New file
@@ -0,0 +1,11 @@
package com.by4cloud.platformx.business.mapper;
import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ContractPaymentScheduleMapper extends PlatformxBaseMapper<ContractPaymentSchedule> {
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractSubjectMatterMapper.java
New file
@@ -0,0 +1,11 @@
package com.by4cloud.platformx.business.mapper;
import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface ContractSubjectMatterMapper extends PlatformxBaseMapper<ContractSubjectMatter> {
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractPaymentScheduleService.java
New file
@@ -0,0 +1,8 @@
package com.by4cloud.platformx.business.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
public interface ContractPaymentScheduleService extends IService<ContractPaymentSchedule> {
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
New file
@@ -0,0 +1,12 @@
package com.by4cloud.platformx.business.service;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.common.data.mybatis.IIService;
/**
 * @author 28254
 */
public interface ContractService extends IIService<Contract> {
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractSubjectMatterService.java
New file
@@ -0,0 +1,8 @@
package com.by4cloud.platformx.business.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
public interface ContractSubjectMatterService extends IService<ContractSubjectMatter> {
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleServiceImpl.java
New file
@@ -0,0 +1,16 @@
package com.by4cloud.platformx.business.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
import com.by4cloud.platformx.business.mapper.ContractPaymentScheduleMapper;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
import org.springframework.stereotype.Service;
/**
 * 合同收款计划/履约节点表
 *
 * @author platformx
 * @date 2026-04-29 16:37:26
 */
@Service
public class ContractPaymentScheduleServiceImpl extends ServiceImpl<ContractPaymentScheduleMapper, ContractPaymentSchedule> implements ContractPaymentScheduleService {
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
New file
@@ -0,0 +1,17 @@
package com.by4cloud.platformx.business.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.business.entity.Contract;
import com.by4cloud.platformx.business.mapper.ContractMapper;
import com.by4cloud.platformx.business.service.ContractService;
import org.springframework.stereotype.Service;
/**
 * @author cd
 * @description
 * @date 2026/4/29 14:07
 **/
@Service
public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> implements ContractService {
}
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractSubjectMatterServiceImpl.java
New file
@@ -0,0 +1,16 @@
package com.by4cloud.platformx.business.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
import com.by4cloud.platformx.business.mapper.ContractSubjectMatterMapper;
import com.by4cloud.platformx.business.service.ContractSubjectMatterService;
import org.springframework.stereotype.Service;
/**
 * 合同标的物明细表
 *
 * @author platformx
 * @date 2026-04-29 16:39:29
 */
@Service
public class ContractSubjectMatterServiceImpl extends ServiceImpl<ContractSubjectMatterMapper, ContractSubjectMatter> implements ContractSubjectMatterService {
}
platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml
New file
@@ -0,0 +1,7 @@
<?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.by4cloud.platformx.business.mapper.ContractMapper">
</mapper>
platformx-business-finance-biz/src/main/resources/mapper/ContractPaymentScheduleMapper.xml
New file
@@ -0,0 +1,31 @@
<?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.by4cloud.platformx.business.mapper.ContractPaymentScheduleMapper">
  <resultMap id="contractPaymentScheduleMap" type="com.by4cloud.platformx.business.entity.ContractPaymentSchedule">
        <id property="id" column="id"/>
        <result property="compId" column="comp_id"/>
        <result property="actualAmount" column="actual_amount"/>
        <result property="agreedDays" column="agreed_days"/>
        <result property="calculationBasis" column="calculation_basis"/>
        <result property="contractId" column="contract_id"/>
        <result property="contractName" column="contract_name"/>
        <result property="effectiveDate" column="effective_date"/>
        <result property="fulfillmentStatus" column="fulfillment_status"/>
        <result property="paymentRatio" column="payment_ratio"/>
        <result property="paymentStatus" column="payment_status"/>
        <result property="plannedAmount" column="planned_amount"/>
        <result property="plannedPaymentDate" column="planned_payment_date"/>
        <result property="remark" column="remark"/>
        <result property="stageName" column="stage_name"/>
        <result property="stageOrder" column="stage_order"/>
        <result property="subjectMatterId" column="subject_matter_id"/>
        <result property="subjectMatterName" column="subject_matter_name"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="delFlag" column="del_flag"/>
  </resultMap>
</mapper>
platformx-business-finance-biz/src/main/resources/mapper/ContractSubjectMatterMapper.xml
New file
@@ -0,0 +1,40 @@
<?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.by4cloud.platformx.business.mapper.ContractSubjectMatterMapper">
  <resultMap id="contractSubjectMatterMap" type="com.by4cloud.platformx.business.entity.ContractSubjectMatter">
        <id property="id" column="id"/>
        <result property="compId" column="comp_id"/>
        <result property="acceptTime" column="accept_time"/>
        <result property="actualDeliveryDate" column="actual_delivery_date"/>
        <result property="attachmentUrl" column="attachment_url"/>
        <result property="brand" column="brand"/>
        <result property="category" column="category"/>
        <result property="contractId" column="contract_id"/>
        <result property="contractName" column="contract_name"/>
        <result property="deliveryPlace" column="delivery_place"/>
        <result property="deliveryStatus" column="delivery_status"/>
        <result property="description" column="description"/>
        <result property="isAccepted" column="is_accepted"/>
        <result property="materialCode" column="material_code"/>
        <result property="materialInternalName" column="material_internal_name"/>
        <result property="materialName" column="material_name"/>
        <result property="plannedDeliveryDate" column="planned_delivery_date"/>
        <result property="quantity" column="quantity"/>
        <result property="sortOrder" column="sort_order"/>
        <result property="specification" column="specification"/>
        <result property="taxAmount" column="tax_amount"/>
        <result property="taxRate" column="tax_rate"/>
        <result property="totalAmount" column="total_amount"/>
        <result property="totalAmountExcludingTax" column="total_amount_excluding_tax"/>
        <result property="unit" column="unit"/>
        <result property="unitPrice" column="unit_price"/>
        <result property="warrantyPeriod" column="warranty_period"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="delFlag" column="del_flag"/>
  </resultMap>
</mapper>