付款进度代码同步

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaPaymentProgress.java

@@ -0,0 +1,70 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目付款进度对象 oa_payment_progress
+ *
+ * @author hdka
+ * @date 2025-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_payment_progress")
+public class OaPaymentProgress extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 付款进度ID
+     */
+    @TableId(value = "payment_progress_id")
+    private Long paymentProgressId;
+    /**
+     * 关联项目ID，引用 oa_project.project_id
+     */
+    private Long projectId;
+    /**
+     * 付款开始时间
+     */
+    private Date startTime;
+    /**
+     * 付款结束时间
+     */
+    private Date endTime;
+    /**
+     * 付款金额
+     */
+    private BigDecimal amount;
+    /**
+     * 是否作废：0正常；1作废
+     */
+    private Integer isVoid;
+    /**
+     * 删除标志：0正常；1已删除
+     */
+    @TableLogic
+    private Integer delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 完成标志
+     */
+    private Long complete;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFinance.java

@@ -107,4 +107,20 @@ public class SysOaFinance extends BaseEntity {
     @TableField(exist = false)
     private List<SysOaDetail> detailList;
 
+    private Long paymentProgressId;
+
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 完成状态
+     */
+    private Long status;
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaPaymentProgressBo.java

@@ -0,0 +1,71 @@
+package com.ruoyi.oa.domain.bo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaPaymentProgressBo extends BaseEntity {
+
+    /**
+     * 付款进度ID
+     */
+    private Long paymentProgressId;
+
+    /**
+     * 关联项目ID，引用 oa_project.project_id
+     */
+    private Long projectId;
+
+    /**
+     * 付款开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    /**
+     * 付款结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    /**
+     * 付款金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 是否作废：0正常；1作废
+     */
+    private Integer isVoid;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+
+
+    /**
+     * 完成标志
+     */
+    private Long complete;
+
+    private String projectName;
+
+    private String projectCode;
+
+    private String projectNum;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFinanceBo.java

@@ -120,5 +120,24 @@ public class SysOaFinanceBo extends BaseEntity {
      */
     private String outType;
 
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 付款进度id
+     */
+    private Long paymentProgressId;
+
+    /**
+     * 完成状态
+     */
+    private Long status;
 
 }

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaPaymentProgressVo.java

@@ -0,0 +1,81 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.math.BigDecimal;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 项目付款进度视图对象 oa_payment_progress
+ *
+ * @author hdka
+ * @date 2025-05-23
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaPaymentProgressVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 付款进度ID
+     */
+    @ExcelProperty(value = "付款进度ID")
+    private Long paymentProgressId;
+
+    /**
+     * 关联项目ID，引用 oa_project.project_id
+     */
+    @ExcelProperty(value = "关联项目ID，引用 oa_project.project_id")
+    private Long projectId;
+
+    /**
+     * 付款开始时间
+     */
+    @ExcelProperty(value = "付款开始时间")
+    private Date startTime;
+
+    /**
+     * 付款结束时间
+     */
+    @ExcelProperty(value = "付款结束时间")
+    private Date endTime;
+
+    /**
+     * 付款金额
+     */
+    @ExcelProperty(value = "付款金额")
+    private BigDecimal amount;
+
+    /**
+     * 是否作废：0正常；1作废
+     */
+    @ExcelProperty(value = "是否作废：0正常；1作废")
+    private Integer isVoid;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    private String projectName;
+    private String projectCode;
+    private String projectNum;
+
+    private Date earliestEndTime;
+
+
+    /**
+     * 完成标志
+     */
+    private Long complete;
+
+    /**
+     * 完成资格
+     */
+    private Long qualified;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java

@@ -140,6 +140,16 @@ public class SysOaFinanceVo extends SysOaFinance {
      */
     private String outType;
 
+    /**
+     * 开始时间
+     */
+    private Date beginTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
     /**
      * 类型金钱综合用于饼图数据
      */
@@ -151,4 +161,9 @@ public class SysOaFinanceVo extends SysOaFinance {
 
     private String month;
 
+    /**
+     * 完成状态
+     */
+    private Long status;
+
 }