From e5abdb4e4f88a2b22a444ebd7b69207b07f5c6e4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 11:15:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
index e05cbd7..3f3f32d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
@@ -1,19 +1,30 @@
package com.vci.ubcs.code.entity;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFilter;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.github.yulichang.annotation.EntityMapping;
+import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
+import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
+import java.util.List;
+
/**
- * 鐮佹鍩虹淇℃伅鏁版嵁鎿嶄綔灞�
+ * 缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆
*
* @author ludc
* @date 2023/5/19 17:24
*/
@Data
-@TableName("PL_CODE_REFERCONFIG")
+@TableName(CodeTableNameConstant.PL_CODE_REFERCONFIG)
@ApiModel(value = "CodeReferConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆")
+@JsonInclude(JsonInclude.Include.NON_EMPTY) //涓嶈緭鍑烘帀绌哄瓧娈�
public class CodeReferConfig extends BaseModel {
/**
@@ -59,7 +70,12 @@
/**
* 绐楀彛鏄剧ず鐨勯珮搴�
*/
- private Long height;
+ private Integer height;
+
+ /**
+ * 杩囨护(绾ц仈)灞炴��
+ */
+ private String useFormKey;
/**
* 杩囨护灞炴�ц姹傚弬鏁�
@@ -89,7 +105,7 @@
/**
* 姣忛〉鏄剧ず鏉℃暟
*/
- private String limit;
+ private Integer limit;
/**
* 鎺掑簭瀛楁
@@ -127,9 +143,39 @@
private String onlyLeaf;
/**
+ * 鍙傜収鐨勪笟鍔＄被鍨�-鏄剧ず鏂囨湰
+ */
+ private String referTypeName;
+
+ /**
+ * 鏄惁寮�鍚叏灞�
+ */
+ private String isOpenGlobal;
+
+ /**
* 鎺掑簭
*/
private Integer orderNum;
+ /**
+ * 鏄惁寮�鍚寔涔呭寲
+ */
+ private String isPersistence;
+
+ /**
+ * 鏄剧ず鐨勫睘鎬�-鏄剧ず瀵硅薄
+ */
+ @TableField(exist = false)
+ @EntityMapping(thisField = "oid", joinField = "referConfigOid")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private List<CodeShowFieldConfig> codeShowFieldConfigs;
+
+ /**
+ * 鏌ヨ鏉′欢鏄剧ず瀵硅薄
+ */
+ @TableField(exist = false)
+ @EntityMapping(thisField = "oid", joinField = "referConfigOid")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private List<CodeSrchCondConfig> codeSrchCondConfigs;
}
--
Gitblit v1.9.3