调整合同

2026-09-14 15:00:40 +08:00
parent 940f0b9b9f
commit 70e44da789
10 changed files with 254 additions and 20 deletions
@@ -31,6 +31,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;

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

@@ -123,12 +124,31 @@ public class ContractManage extends TenantEntity {
 	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
 	private Integer paymentDays;

+	@Schema(description = "合同金额")
+	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
+	private BigDecimal contractAmount;
+
+	@Schema(description = "是否范本")
+	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
+	private Integer templateFlag;
+
+	@Schema(description = "原件合同编号")
+	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
+	private String originalContractNo;
+
+	@Schema(description = "是否电子章")
+	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
+	private Integer electronicSealFlag;
+
 	@Schema(description = "合同阶段")
 	private String contractStage;

 	@Schema(description = "审核状态")
 	private String approvalStatus;

+	@Schema(description = "归档状态：未归档/已归档")
+	private String archiveStatus;
+
 	@Schema(description = "当前节点")
 	private String currentNode;

@@ -141,7 +161,7 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "计费信息开关")
 	private Integer billingEnabled;

-	@Schema(description = "费用生成模式：system系统生成，manual手动生成")
+	@Schema(description = "费用生成模式：system系统生成，manual账单导入生成")
 	private String feeGenerationMode;

 	@Schema(description = "合同主文件JSON")
@@ -80,6 +80,10 @@ public class ProjectApplyVO extends ProjectApply {
 	@Schema(description = "是否仅查询可用于临时额度申请的项目")
 	private Boolean temporaryCreditLimitSelectable;

+	@TableField(exist = false)
+	@Schema(description = "是否仅查询可用于合同选择的项目（含临时项目与正式审批通过项目）")
+	private Boolean contractSelectable;
+
 	@TableField(exist = false)
 	@Schema(description = "资金使用风险等级：high、medium、none")
 	private String fundUseRisk;