From 85d10ebf08cb41fa3ec06272e6e991cdd0a534f9 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 01 六月 2023 17:54:58 +0800
Subject: [PATCH] 集团集属性映射界面加载接口bug修复

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 49 insertions(+), 0 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..4ff4161 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,9 +1,21 @@
 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.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;
 
 /**
  * 鐮佹鍩虹淇℃伅鏁版嵁鎿嶄綔灞�
@@ -14,12 +26,19 @@
 @Data
 @TableName("PL_CODE_REFERCONFIG")
 @ApiModel(value = "CodeReferConfig瀵硅薄", description = "缂栫爜瑙勫垯绠$悊-寮曠敤鐮佹-鍙傜収閰嶇疆")
+@JsonInclude(JsonInclude.Include.NON_EMPTY)  //涓嶈緭鍑烘帀绌哄瓧娈�
 public class CodeReferConfig extends BaseModel {
 
 	/**
 	 * 搴忓垪鍖�
 	 */
 	private static final long serialVersionUID = 957685333614390234L;
+
+	/**
+	 * 绉熸埛ID
+	 */
+	@JSONField()
+	private String tenantId;
 
 	/**
 	 * 鍙傜収鐨勪笟鍔$被鍨�
@@ -127,9 +146,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