From ff13957c5d2d3cc037fea9009feddaaa609f699e Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 10 十一月 2023 16:07:22 +0800
Subject: [PATCH] 1、标准申请界面查询页面控件将传递过来的默认值渲染上返回给前端。

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UIFormItemVO.java   |   13 +++++++++++++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java |   16 +++++++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UIFormItemVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UIFormItemVO.java
index 46608b1..a703fbe 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UIFormItemVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UIFormItemVO.java
@@ -3,6 +3,7 @@
 
 import com.vci.ubcs.starter.web.pagemodel.KeyValue;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -136,6 +137,10 @@
 	 * 杈撳叆鎻愮ず
 	 */
 	private String inputTip;
+	/**
+	 * 鍏跺畠灞炴�ч兘鍙互寰�閲岄潰鏀�
+	 */
+	private Map<String, String> addField = new HashMap<>();
 
 	public boolean isKeyAttr() {
 		return keyAttr;
@@ -329,6 +334,14 @@
 		this.selectLibFlag = selectLibFlag;
 	}
 
+	public Map<String, String> getAddField() {
+		return addField;
+	}
+
+	public void setAddField(Map<String, String> addField) {
+		this.addField = addField;
+	}
+
 	@Override
 	public String toString() {
 		return "UIFormItemVO{" +
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
index 88db082..1cfa4d7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -83,13 +83,19 @@
 
 	/**
 	 * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
-	 * @param codeClassifyOid 浣跨敤妯℃澘鐨勫垎绫讳富閿�
+	 * @param map 浼犵殑鏁版嵁
 	 * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗曪級
 	 */
-	@GetMapping("/getFormDefineByTemplateOid")
-	public MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyOid){
-		CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(codeClassifyOid);
-		return mdmEngineService.getFormDefineByTemplateOid(usedTemplateByClassifyOid.getOid(),codeClassifyOid);
+	@RequestMapping("/getFormDefineByTemplateOid")
+	public MdmUIInfoVO getFormDefineByTemplateOid(@RequestParam Map<String,String> map){
+//		CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(codeClassifyOid);
+		CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(map.get("codeClassifyOid"));
+		MdmUIInfoVO formDefineByTemplate = mdmEngineService.getFormDefineByTemplateOid(usedTemplateByClassifyOid.getOid(), map.get("codeClassifyOid"));
+		for (UIFormItemVO item : formDefineByTemplate.getFormDefineVO().getItems()) {
+			if(map.get(item.getField()) != null){
+				item.getAddField().put("defaultValue",map.get(item.getField()));
+			}
+		}return formDefineByTemplate;
 	}
 
 	/**

--
Gitblit v1.9.3