From 2dae10802e6c92a82d93587081e4a7d4be673a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 8 Oct 2023 17:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A72.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mdp/form/entity/FormField.java   |  3 +++
 .../com/mdp/form/service/FormDataService.java | 25 ++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormField.java b/mdp-form/src/main/java/com/mdp/form/entity/FormField.java
index 0d39391..09a2774 100644
--- a/mdp-form/src/main/java/com/mdp/form/entity/FormField.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormField.java
@@ -115,6 +115,9 @@ public class FormField  implements java.io.Serializable {
 
 
 
+	@ApiModelProperty(notes="样式",allowEmptyValue=true,example="",allowableValues="")
+	String clazz;
+
 	/**
 	 *表单编号,主键-字段编号对应数据库
 	 **/
diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java
index c0aefd4..804b9df 100644
--- a/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormDataService.java
@@ -1,5 +1,7 @@
 package com.mdp.form.service;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -79,28 +81,23 @@ public class FormDataService extends BaseService<FormDataMapper,FormData> {
 	 * @return
 	 */
 	public String createBizKey(FormDefVo formDefVo,FormData formData){
-		User user= LoginUtils.getCurrentUserInfo();
 		FormDef formDef=formDefVo.getFormDef();
 		if(ObjectTools.isEmpty(formDef.getPks())){
 			return "";
 		}
-		String[] pkIds1=formDef.getPks().split(":");
-		String ctimeFormat="";
-		if(pkIds1.length>1){
-			ctimeFormat=pkIds1[1];
-		}
-		String[] pkIds=pkIds1[0].split(",");
+
+		String[] pkIds=formDef.getPks().split(",");
 		List<String> extInfosPkIds= Arrays.stream(pkIds).filter(k->k.indexOf(".")>=0).collect(Collectors.toList());
-		Map<String,Object> extInfos=new HashMap<>();
+		JSONArray extInfos=new JSONArray();
 		if(extInfosPkIds.size()>0){
-			extInfos= JSONObject.parseObject(formData.getExtInfos());
+			extInfos= JSON.parseArray(formData.getExtInfos());
 		}
 		List<String> bizKeys=new ArrayList<>();
 		Map<String,Object> formDataMap=null;
 		for (String pkId : pkIds) {
 			if(pkId.indexOf(".")<0){
-				if(pkId.equals("ctime")){
-					String formate=transNum2String(ctimeFormat);
+				if(pkId.startsWith("ctime:")){
+					String formate=transNum2String(pkId.split(":")[1]);
 					String ctime=DateUtils.format(formData.getCtime(),formate);
 					bizKeys.add(ctime);
 				}else if("cuserid".equals(pkId)){
@@ -120,11 +117,11 @@ public class FormDataService extends BaseService<FormDataMapper,FormData> {
 			}else{
 				String pkIdTrim=pkId.replaceAll("\\w*[.]","");
 
-				String v= (String) extInfos.get(pkIdTrim);
-				if(ObjectTools.isEmpty(v)){
+				Optional<Object> options=extInfos.stream().filter(e->((JSONObject)e).getString("id").equals(pkIdTrim)).findAny();
+				if(!options.isPresent()){
 					throw new BizException(LangTips.errMsg("pk-field-required","%s不能为空",pkId));
 				}
-				bizKeys.add(v);
+				bizKeys.add(((JSONObject)(options.get())).getString("value"));
 			}
 		}
 		return bizKeys.stream().collect(Collectors.joining(","));