zhaocaiapi提交

2026-06-17 09:14:50 +08:00
parent a7ba0f21e5
commit 49ccfe70b5
13 changed files with 367 additions and 73 deletions
@@ -29,21 +29,21 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.tenant.mp.TenantEntity;

 import java.io.Serial;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

 /**
- * 招采计划实体类
+ * 年度招采计划实体类
 *
 * @author Chill
 */
@Data
-@TableName("blade_procurement_plan")
+@TableName("zc_procurement_plan")
@EqualsAndHashCode(callSuper = true)
-public class ProcurementPlan extends BaseEntity {
+public class ProcurementPlan extends TenantEntity {

 	@Serial
 	private static final long serialVersionUID = 1L;
@@ -85,21 +85,21 @@ public class ProcurementPlan extends BaseEntity {
 	private String year;

 	/**
-	 * 所属部门
+	 * 需求部门
 	 */
-	@Schema(description = "所属部门")
+	@Schema(description = "需求部门")
 	private String dept;

 	/**
-	 * 申请信息中的所属公司
+	 * 需求公司
 	 */
-	@Schema(description = "申请所属公司")
+	@Schema(description = "需求公司")
 	private String applyCompany;

 	/**
-	 * 预估总金额(万元)
+	 * 年度预估总金额(万元)
 	 */
-	@Schema(description = "预估总金额(万元)")
+	@Schema(description = "年度预估总金额(万元)")
 	private BigDecimal estimatedAmount;

 	/**
@@ -114,4 +114,16 @@ public class ProcurementPlan extends BaseEntity {
 	@Schema(description = "备注")
 	private String remark;

+	/**
+	 * 流程当前节点
+	 */
+	@Schema(description = "流程当前节点")
+	private String flowStatus;
+
+	/**
+	 * 流程实例ID
+	 */
+	@Schema(description = "流程实例ID")
+	private String processInstanceId;
+
 }
@@ -31,20 +31,21 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.tenant.mp.TenantEntity;

 import java.io.Serial;
+import java.math.BigDecimal;
 import java.time.LocalDate;

 /**
- * 招采计划明细实体类
+ * 年度招采计划项目明细实体类
 *
 * @author Chill
 */
@Data
-@TableName("blade_procurement_plan_detail")
+@TableName("zc_procurement_plan_project")
@EqualsAndHashCode(callSuper = true)
-public class ProcurementPlanDetail extends BaseEntity {
+public class ProcurementPlanDetail extends TenantEntity {

 	@Serial
 	private static final long serialVersionUID = 1L;
@@ -63,16 +64,10 @@ public class ProcurementPlanDetail extends BaseEntity {
 	private String year;

 	/**
-	 * 计划
+	 * 计划号
 	 */
-	@Schema(description = "计划")
-	private String plan;
-
-	/**
-	 * 计划类型
-	 */
-	@Schema(description = "计划类型")
-	private String planType;
+	@Schema(description = "计划号")
+	private String planNo;

 	/**
 	 * 序号
@@ -98,6 +93,13 @@ public class ProcurementPlanDetail extends BaseEntity {
 	@Schema(description = "项目对接人")
 	private String contactPerson;

+	/**
+	 * 项目对接人ID
+	 */
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "项目对接人ID")
+	private Long contactPersonId;
+
 	/**
 	 * 计划申请日期
 	 */
@@ -117,9 +119,39 @@ public class ProcurementPlanDetail extends BaseEntity {
 	private String projectAttr;

 	/**
-	 * 采购物料明细
+	 * 采购需求
 	 */
-	@Schema(description = "采购物料明细")
+	@Schema(description = "采购需求")
+	private String purchaseRequirement;
+
+	/**
+	 * 预算金额（万元）
+	 */
+	@Schema(description = "预算金额（万元）")
+	private BigDecimal budgetAmount;
+
+	/**
+	 * 招标方式
+	 */
+	@Schema(description = "招标方式")
+	private String biddingMethod;
+
+	/**
+	 * 项目简介
+	 */
+	@Schema(description = "项目简介")
+	private String projectIntro;
+
+	/**
+	 * 备注
+	 */
+	@Schema(description = "备注")
+	private String remark;
+
+	/**
+	 * 物料明细冗余汇总
+	 */
+	@Schema(description = "物料明细冗余汇总")
 	private String materialDetail;

 }
@@ -31,9 +31,10 @@ import lombok.EqualsAndHashCode;
 import org.springblade.zhaocai.pojo.entity.ProcurementPlanDetail;

 import java.io.Serial;
+import java.util.List;

 /**
- * 招采计划明细视图对象
+ * 年度招采计划项目明细视图对象
 *
 * @author Chill
 */
@@ -44,4 +45,10 @@ public class ProcurementPlanDetailVO extends ProcurementPlanDetail {
 	@Serial
 	private static final long serialVersionUID = 1L;

+	/**
+	 * 物料明细列表
+	 */
+	@Schema(description = "物料明细列表")
+	private List<ProcurementPlanMaterialVO> materialList;
+
 }