付款进度代码同步

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

@@ -79,4 +79,6 @@ public class SysOaWarehouseTask extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
+    private String unit;
+
 }

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

@@ -181,5 +181,7 @@ public class SysOaProjectBo extends BaseEntity {
      * 代号类型
      */
     private String projectCode;
+
+    private String status;
 }
 

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

@@ -84,4 +84,9 @@ public class SysOaWarehouseTaskBo extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
+
+    /**
+     * 单位
+     */
+    private String unit;
 }

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

@@ -0,0 +1,14 @@
+package com.ruoyi.oa.domain.vo;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DashboardChartsVo {
+
+    private List<TrendPointVo> contractAmountTrend;      // 折线图
+    private List<StatusCountVo> projectStatusDistribution; // 饼图
+    private List<TrendPointVo> monthlyContractComparison; // 柱状图
+}

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

@@ -0,0 +1,24 @@
+package com.ruoyi.oa.domain.vo;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class DashboardMetricsVo {
+    // 本月合同总额
+    private BigDecimal totalFunds;
+    // 合同数量统计
+    private Integer contractCount;
+    // 临期项目数量
+    private Integer expiringCount;
+    // 月度目标完成率（0-100）
+    private BigDecimal completionRate;
+
+    private BigDecimal growthFunds;
+
+    private BigDecimal growthCount;
+
+    private BigDecimal growthExpiring;
+}

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

@@ -99,6 +99,12 @@ public class OaProgressVo {
      */
     private String contactPhone;
 
+    /**
+     * 父项目电话
+     */
+    private String parentPhone;
+    private String nowDepart;
+
     // 新增统计字段
     private Long progressSize;
     private Long finishCount;

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

@@ -0,0 +1,10 @@
+package com.ruoyi.oa.domain.vo;
+
+
+import lombok.Data;
+
+@Data
+public class StatusCountVo {
+    private String status;  // "正常"/"进行中"/"即将到期"/"已逾期"
+    private Integer count;
+}

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

@@ -246,4 +246,9 @@ public class SysOaProjectVo {
      */
     private String projectCode;
 
+    /**
+     * 项目状态
+     */
+    private String status;
+
 }

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

@@ -86,4 +86,9 @@ public class SysOaWarehouseTaskVo {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
+    /**
+     * 单位
+     */
+    private String unit;
+
 }

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

@@ -0,0 +1,12 @@
+package com.ruoyi.oa.domain.vo;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class TrendPointVo {
+    private String month;      // 如 "1月"
+    private BigDecimal value;  // 金额或数量
+}