From 099ea14bba367fd86f0dde37d908f07cc04c3d39 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 10 四月 2025 15:38:01 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang --- ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java index 52031d9..bfa74dd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.util.List; @Data @@ -15,9 +16,18 @@ @ApiModelProperty(value = "合同编号") private String contractNumber; @ApiModelProperty(value = "合同名称") - private Integer contractName; - @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订") + private String contractName; + @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算") private Integer status; @ApiModelProperty(value = "选中的行") private List<String> ids; + @NotBlank(message = "租户id不可为空") + @ApiModelProperty(value = "租户id") + private String tenantId; + @ApiModelProperty(value = "查询多个状态") + private List<Integer> statuses; + + @ApiModelProperty(value = "营运部门ID") + private String businessDeptId; + } -- Gitblit v1.7.1