From 2ebe2d5e74910b678c2a6d80cfbf5d9e6852bb23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 11 Sep 2023 00:33:31 +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/FormDefVo.java   | 19 ++++---------------
 .../com/mdp/form/service/FormDefService.java  |  4 ++--
 .../mdp/form/service/FormFieldService.java    |  7 ++++++-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/mdp-form/src/main/java/com/mdp/form/entity/FormDefVo.java b/mdp-form/src/main/java/com/mdp/form/entity/FormDefVo.java
index a03fee0..6a8b6df 100644
--- a/mdp-form/src/main/java/com/mdp/form/entity/FormDefVo.java
+++ b/mdp-form/src/main/java/com/mdp/form/entity/FormDefVo.java
@@ -1,27 +1,16 @@
 package com.mdp.form.entity;
 
+import lombok.Data;
+
 import java.util.List;
 
+@Data
 public class FormDefVo implements java.io.Serializable{
 	
 	FormDef formDef;
 	
 	List<FormField> formFields;
 
-	public FormDef getFormDef() {
-		return formDef;
-	}
-
-	public void setFormDef(FormDef formDef) {
-		this.formDef = formDef;
-	}
-
-	public List<FormField> getFormFields() {
-		return formFields;
-	}
-
-	public void setFormFields(List<FormField> formFields) {
-		this.formFields = formFields;
-	}
+	FormQx formQx;
 
 }
diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
index ab45683..f7215be 100644
--- a/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormDefService.java
@@ -96,7 +96,7 @@ public class FormDefService extends BaseService<FormDefMapper,FormDef> {
 			formField.setFormId(formDef.getId());
 			formField.setId(ffs.createKey("id"));
 		}
-		super.insert(formDef);
+		super.save(formDef);
 		this.ffs.saveBatch(formFields);
 		formFieldCacheService.putFormFields(formId, formDefVo);
 	}
@@ -125,7 +125,7 @@ public class FormDefService extends BaseService<FormDefMapper,FormDef> {
 			formField.setFormId(formDef.getId());
 			formField.setId(ffs.createKey("id"));
 		}
-		this.save(formDef);
+		this.updateById(formDef,true);
 		this.ffs.deleteByFormId(formDef.getId());
 		this.ffs.saveBatch(formFields);
 
diff --git a/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java b/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
index 88ead5a..dca5ea3 100644
--- a/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
+++ b/mdp-form/src/main/java/com/mdp/form/service/FormFieldService.java
@@ -3,8 +3,10 @@ package com.mdp.form.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mdp.core.query.QueryTools;
 import com.mdp.form.entity.FormDef;
 import com.mdp.form.entity.FormDefVo;
+import com.mdp.form.entity.FormQx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.util.List;
@@ -42,7 +44,8 @@ public class FormFieldService extends BaseService<FormFieldMapper,FormField> {
 	@Autowired
 	FormDefService formDefService;
 
-
+	@Autowired
+	FormQxService formQxService;
 
 	public void deleteByFormId(String formId) {
 		UpdateWrapper<FormField> uw= new UpdateWrapper<FormField>();
@@ -62,6 +65,8 @@ public class FormFieldService extends BaseService<FormFieldMapper,FormField> {
 			List<FormField> formFields = this.selectListByWhere(formFieldQuery);	//列出FormField列表
 			formDefVo.setFormDef(formDef);
 			formDefVo.setFormFields(formFields);
+			FormQx formQx=formQxService.getOne(QueryTools.initQueryWrapper(FormQx.class).eq("form_id",formId));
+			formDefVo.setFormQx(formQx);
 			formFieldCacheService.putFormFields(formId, formDefVo);
 		}
 		return formDefVo;