From c6a54f63df671de4592e336b9b8cd8406d4e3b51 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 02 六月 2023 16:25:27 +0800
Subject: [PATCH] 解决动态模块冲突
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeReferConfigVO.java | 114 +++++++-------------------------------------------------
1 files changed, 15 insertions(+), 99 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeReferConfigVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeReferConfigVO.java
index 40f0b97..2c33f37 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeReferConfigVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/CodeReferConfigVO.java
@@ -1,10 +1,16 @@
package com.vci.ubcs.code.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.code.entity.CodeReferConfig;
+import com.vci.ubcs.code.entity.CodeShowFieldConfig;
+import com.vci.ubcs.code.entity.CodeSrchCondConfig;
import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
+
+import java.util.List;
/**
* 鐮佹鍩虹淇℃伅鏁版嵁鎿嶄綔灞�
@@ -13,7 +19,7 @@
* @date 2023/5/19 17:24
*/
@Data
-public class CodeReferConfigVO extends BaseModelVO {
+public class CodeReferConfigVO extends CodeReferConfig {
/**
* 搴忓垪鍖�
@@ -21,109 +27,19 @@
private static final long serialVersionUID = 957685333614390234L;
/**
- * 鍙傜収鐨勪笟鍔＄被鍨�
+ * 鍙傜収绐楀彛绫诲瀷-鏄剧ず灞炴��
*/
- private String referType;
+ private String typeText;
/**
- * 鏄剧ず鐨勫睘鎬�
+ * 鏄剧ず鐨勫睘鎬�-鏄剧ず瀵硅薄
*/
- private String textField;
+ @TableField(exist = false)
+ private List<CodeShowFieldConfigVO> codeShowFieldConfigVOS;
/**
- * 瀛樺偍鍊肩殑灞炴��
+ * 鏌ヨ鏉′欢鏄剧ず瀵硅薄
*/
- private String valueField;
-
- /**
- * 鍙傜収绐楀彛绫诲瀷
- */
- private String type;
-
- /**
- * 鑷畾涔夌殑鍚庡彴璺緞
- */
- private String url;
-
- /**
- * 鏈嶅姟鐨勫湴鍧�
- */
- private String backPath;
-
- /**
- * 璇锋眰鍚庡彴鐨勫崗璁柟寮�
- */
- private String method;
-
- /**
- * 绐楀彛鏄剧ず鐨勯珮搴�
- */
- private Long height;
-
- /**
- * 杩囨护灞炴�ц姹傚弬鏁�
- */
- private String paramForFormKey;
-
- /**
- * 鏄惁澶氶��
- */
- private String isMuti;
-
- /**
- * 鏄犲皠鍏朵粬灞炴��
- */
- private String mapFields;
-
- /**
- * 鍙傝�冪殑UI涓婁笅鏂�
- */
- private String referContent;
-
- /**
- * 骞冲彴鐨勮〃鏍肩紪鍙�
- */
- private String displayTable;
-
- /**
- * 姣忛〉鏄剧ず鏉℃暟
- */
- private String limit;
-
- /**
- * 鎺掑簭瀛楁
- */
- private String sortField;
-
- /**
- * 鎺掑簭绫诲瀷
- */
- private String sortType;
-
- /**
- * 鏍戝舰鐨勪笂绾у睘鎬�
- */
- private String parentFieldName;
-
- /**
- * 涓婄骇灞炴�у�煎搴斿睘鎬�
- */
- private String parentUsedField;
-
- /**
- * 鏍硅妭鐐圭殑鍊�
- */
- private String parentValue;
-
- /**
- * 鏍戝姞杞芥柟寮�
- */
- private String loadType;
-
- /**
- * 鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣
- */
- private String onlyLeaf;
-
-
+ @TableField(exist = false)
+ private List<CodeSrchCondConfigVO> codeSrchCondConfigVOS;
}
--
Gitblit v1.9.3