From 68092fe87359d7b68df0febffcf9538cb0e783c8 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 26 十二月 2025 10:19:39 +0800
Subject: [PATCH] product_sys_face表字段大写兼容
---
src/main/java/com/product/face/service/FaceApplyService.java | 5 +++++
src/main/java/com/product/face/service/FaceDesignService.java | 12 ++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/product/face/service/FaceApplyService.java b/src/main/java/com/product/face/service/FaceApplyService.java
index ccc6406..9f9149a 100644
--- a/src/main/java/com/product/face/service/FaceApplyService.java
+++ b/src/main/java/com/product/face/service/FaceApplyService.java
@@ -77,6 +77,11 @@
if (faceFormCache == null) {
throw new BaseException(ErrorCode.GET_FACE_CONF_FAIL);
}
+ //澶у啓瀛楁鍊兼樉绀鸿浆鎹�
+ JSONObject formInfo = faceFormCache.getData();
+ formInfo.put("formRules", formInfo.getString("form_rules"));
+ formInfo.put("formModel", formInfo.getString("form_model"));
+ formInfo.put("labelWidth", formInfo.getString("label_width"));
return BaseUtil.success(faceFormCache.getData(), MapUtil.builder("drawingList", (Object) faceFormCache.getDrawingList()).map());
}
diff --git a/src/main/java/com/product/face/service/FaceDesignService.java b/src/main/java/com/product/face/service/FaceDesignService.java
index 3480f04..8838a26 100644
--- a/src/main/java/com/product/face/service/FaceDesignService.java
+++ b/src/main/java/com/product/face/service/FaceDesignService.java
@@ -6,7 +6,6 @@
import com.alibaba.fastjson.JSONObject;
import com.product.admin.service.PublicService;
import com.product.common.lang.StringUtils;
-import com.product.core.cache.DataPoolCacheImpl;
import com.product.core.config.CoreConst;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -17,10 +16,7 @@
import com.product.face.config.FaceConst;
import com.product.face.service.ide.IFaceDesignService;
import com.product.face.util.FaceUtil;
-import com.product.file.config.CmnConst;
import com.product.util.BaseUtil;
-import org.apache.poi.hdgf.pointers.Pointer;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -74,6 +70,10 @@
other.put("product_sys_face_custom_field", new String[]{});
}
fse.getSubData().clear();
+ //澶у啓瀛楁鍊兼樉绀鸿浆鎹�
+ fse.setValue("formRules", fse.getString("form_rules"));
+ fse.setValue("formModel", fse.getString("form_model"));
+ fse.setValue("labelWidth", fse.getString("label_width"));
return BaseUtil.success(fse, other);
}
@@ -117,6 +117,10 @@
fieldSetEntityList.addAll(controlTraverse(new JSONObject((Map) fields.getFieldSetEntity(i).getValues()), null, i, pointer));
}
fse.removeSubData(FaceConst.FACE_FIELD);
+ //澶у啓瀛楁鍊间繚瀛樿浆鎹�
+ fse.setValue("form_rules", fse.getString("formRules"));
+ fse.setValue("form_model", fse.getString("formModel"));
+ fse.setValue("label_width", fse.getString("labelWidth"));
BaseUtil.createCreatorAndCreationTime(fse);
fields.setData(fieldSetEntityList);
fse.addSubDataTable(fields);
--
Gitblit v1.9.2