From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +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 | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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 ce80f90..d388e8d 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,38 +1,36 @@
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 org.apache.commons.math3.util.Precision;
-import org.aspectj.weaver.ast.Not;
-import org.ietf.jgss.Oid;
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 {
/**
* 搴忓垪鍖�
*/
private static final long serialVersionUID = 957685333614390234L;
-
- /**
- * 绉熸埛ID
- */
- private String tenantId;
/**
* 鍙傜収鐨勪笟鍔＄被鍨�
@@ -102,7 +100,7 @@
/**
* 姣忛〉鏄剧ず鏉℃暟
*/
- private String limit;
+ private Integer limit;
/**
* 鎺掑簭瀛楁
@@ -140,20 +138,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