From 24fab86e819834e06406900a05cf25958faad0ce Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 29 五月 2023 18:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java | 20 ++++++++++++++++++++
1 files changed, 20 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 ce80f90..30c4034 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,7 +1,11 @@
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;
@@ -22,6 +26,7 @@
@Data
@TableName("PL_CODE_REFERCONFIG")
@ApiModel(value = "CodeReferConfig瀵硅薄", description = "缂栫爜瑙勫垯绠＄悊-寮曠敤鐮佹-鍙傜収閰嶇疆")
+@JsonInclude(JsonInclude.Include.NON_EMPTY) //涓嶈緭鍑烘帀绌哄瓧娈�
public class CodeReferConfig extends BaseModel {
/**
@@ -32,6 +37,7 @@
/**
* 绉熸埛ID
*/
+ @JSONField()
private String tenantId;
/**
@@ -140,6 +146,16 @@
private String onlyLeaf;
/**
+ * 鍙傜収鐨勪笟鍔＄被鍨�-鏄剧ず鏂囨湰
+ */
+ private String referTypeName;
+
+ /**
+ * 鎵�灞為鍩�
+ */
+ private String doMain;
+
+ /**
* 鎺掑簭
*/
private Integer orderNum;
@@ -148,12 +164,16 @@
* 鏄剧ず鐨勫睘鎬�-鏄剧ず瀵硅薄
*/
@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