From d4ccd29668a65b27ed28fb862bceec130d94c87a Mon Sep 17 00:00:00 2001
From: cheng <1821349743@qq.com>
Date: 星期日, 25 八月 2024 14:02:32 +0800
Subject: [PATCH] 获取表达输入性控件

---
 src/main/java/com/product/mobile/core/entity/FaceFieldEntity.java          |  108 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/main/java/com/product/mobile/core/service/FaceMobileService.java       |    5 ++
 src/main/java/com/product/mobile/core/controller/FaceMobileController.java |    2 
 3 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/product/mobile/core/controller/FaceMobileController.java b/src/main/java/com/product/mobile/core/controller/FaceMobileController.java
index 7611f03..749054a 100644
--- a/src/main/java/com/product/mobile/core/controller/FaceMobileController.java
+++ b/src/main/java/com/product/mobile/core/controller/FaceMobileController.java
@@ -35,7 +35,7 @@
 	public String getFaceFieldByTable(HttpServletRequest request) {
 		try {
 			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
-			return BaseUtil.success(faceMobileService.getFlowFaceField(fse));
+			return BaseUtil.success(faceMobileService.getFaceFieldByTable(fse));
 		} catch (BaseException e) {
 			e.printStackTrace();
 			return error(e);
diff --git a/src/main/java/com/product/mobile/core/entity/FaceFieldEntity.java b/src/main/java/com/product/mobile/core/entity/FaceFieldEntity.java
index 0e31fae..c8413b3 100644
--- a/src/main/java/com/product/mobile/core/entity/FaceFieldEntity.java
+++ b/src/main/java/com/product/mobile/core/entity/FaceFieldEntity.java
@@ -7,6 +7,8 @@
  */
 public class FaceFieldEntity {
 
+	private String fieldName;
+
 	/**
 	 * 鏄惁蹇呭~
 	 */
@@ -55,10 +57,6 @@
 	private String fileField;
 
 	/**
-	 * 鎺т欢鎺掑簭
-	 */
-	private Integer controlSequence;
-	/**
 	 * 楂樼骇鍙傜収鍏宠仈璁剧疆
 	 */
 	private String promptSetting;
@@ -68,5 +66,107 @@
 	 */
 	private String serialNumber;
 
+	public String getFieldName() {
+		return fieldName;
+	}
 
+	public void setFieldName(String fieldName) {
+		this.fieldName = fieldName;
+	}
+
+	public String getRequired() {
+		return required;
+	}
+
+	public void setRequired(String required) {
+		this.required = required;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String getAdvanceName() {
+		return advanceName;
+	}
+
+	public void setAdvanceName(String advanceName) {
+		this.advanceName = advanceName;
+	}
+
+	public String getComponentType() {
+		return componentType;
+	}
+
+	public void setComponentType(String componentType) {
+		this.componentType = componentType;
+	}
+
+	public String getMultiple() {
+		return multiple;
+	}
+
+	public void setMultiple(String multiple) {
+		this.multiple = multiple;
+	}
+
+	public String getDisabled() {
+		return disabled;
+	}
+
+	public void setDisabled(String disabled) {
+		this.disabled = disabled;
+	}
+
+	public String getDefaultValue() {
+		return defaultValue;
+	}
+
+	public void setDefaultValue(String defaultValue) {
+		this.defaultValue = defaultValue;
+	}
+
+	public String getPlaceholder() {
+		return placeholder;
+	}
+
+	public void setPlaceholder(String placeholder) {
+		this.placeholder = placeholder;
+	}
+
+	public String getFileTableName() {
+		return fileTableName;
+	}
+
+	public void setFileTableName(String fileTableName) {
+		this.fileTableName = fileTableName;
+	}
+
+	public String getFileField() {
+		return fileField;
+	}
+
+	public void setFileField(String fileField) {
+		this.fileField = fileField;
+	}
+
+	public String getPromptSetting() {
+		return promptSetting;
+	}
+
+	public void setPromptSetting(String promptSetting) {
+		this.promptSetting = promptSetting;
+	}
+
+	public String getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(String serialNumber) {
+		this.serialNumber = serialNumber;
+	}
 }
diff --git a/src/main/java/com/product/mobile/core/service/FaceMobileService.java b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
index 435414b..045154f 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -139,12 +139,15 @@
 					ReflectUtil.setFieldValue(faceFieldEntity, propertyName, setEntity.getObject("property_value"));
 				}
 			}
+			if (StringUtils.isEmpty(faceFieldEntity.getFieldName())) {
+				result.remove(faceFieldEntity);
+				continue;
+			}
 			List<FieldSetEntity> configGroup = groupMap.get(groupUuid);
 			for (FieldSetEntity setEntity : configGroup) {
 				//鎵惧埌灞炴�у悕绉�= __vModel__
 				String propertyName = setEntity.getString("property_name");
 				if ("tag".equals(propertyName)) {
-					result.add(faceFieldEntity);
 					propertyName = "component_type";
 				} else if ("field".equals(propertyName)) {
 					propertyName = "fileField";

--
Gitblit v1.9.2