From 15c6c58535b585374217f9646d6b6ec36a7c71be Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Sat, 4 Dec 2021 23:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eve/service/impl/PageSequenceServiceImpl.java  |  4 +++-
 .../main/resources/reqmapping/mapping/activiti.xml |  2 +-
 .../com/skyeye/eve/dao/DsFormPageSequenceDao.java  |  2 --
 .../mapper/dsform/DsFormPageSequenceMapper.xml     | 14 --------------
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java
index 0d64a0008..3e5b82ca3 100644
--- a/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java
+++ b/skyeye-activiti/src/main/java/com/skyeye/eve/service/impl/PageSequenceServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -205,7 +206,8 @@ public class PageSequenceServiceImpl implements PageSequenceService{
 	@Override
 	public void queryDsFormISDraftDetailsById(InputObject inputObject, OutputObject outputObject) throws Exception {
 		Map<String, Object> map = inputObject.getParams();
-		List<Map<String, Object>> rows = dsFormPageSequenceDao.queryDsFormISDraftDetailsById(map);
+		String sequenceId = map.get("sequenceId").toString();
+		List<Map<String, Object>> rows = dsFormPageDataDao.queryDsFormPageDataListBySequenceId(Arrays.asList(sequenceId));
 		outputObject.setBeans(rows);
 		outputObject.settotal(rows.size());
 	}
diff --git a/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml b/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml
index 4de88a187..ad0601acb 100644
--- a/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml
+++ b/skyeye-activiti/src/main/resources/reqmapping/mapping/activiti.xml
@@ -154,7 +154,7 @@
 		<property id="pageId" name="pageId" ref="required" var="页面id" />
 	</url>
 	<url id="pagesequence006" path="/post/PageSequenceController/queryDsFormISDraftDetailsById" val="表单详情" allUse="2">
-		<property id="rowId" name="id" ref="required" var="表单提交序列id" />
+		<property id="rowId" name="sequenceId" ref="required" var="表单提交序列id" />
 	</url>
 	<!-- 动态表单草稿操作结束 -->
 	
diff --git a/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageSequenceDao.java b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageSequenceDao.java
index 1e9700aa8..4c670b28a 100644
--- a/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageSequenceDao.java
+++ b/skyeye-dsform/src/main/java/com/skyeye/eve/dao/DsFormPageSequenceDao.java
@@ -35,8 +35,6 @@ public interface DsFormPageSequenceDao {
 
 	List<Map<String, Object>> queryDsFormContentBySequenceId(Map<String, Object> map) throws Exception;
 
-	List<Map<String, Object>> queryDsFormISDraftDetailsById(Map<String, Object> map) throws Exception;
-
 	int insertDsFormPageSequence(List<Map<String, Object>> pageSequence) throws Exception;
 
 	List<Map<String, Object>> queryDsFormPageSequenceListByObjectId(@Param("objectId") String objectId) throws Exception;
diff --git a/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageSequenceMapper.xml b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageSequenceMapper.xml
index 3e5db29d4..21477f437 100644
--- a/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageSequenceMapper.xml
+++ b/skyeye-dsform/src/main/resources/mapper/dsform/DsFormPageSequenceMapper.xml
@@ -113,20 +113,6 @@
 		WHERE
 			a.sequence_id = #{id}
 	</select>
-	
-	<select id="queryDsFormISDraftDetailsById" parameterType="java.util.Map" resultType="java.util.Map">
-		SELECT
-			a.title `name`,
-			a.text,
-			a.show_type showType,
-			a.default_width proportion,
-			a.content_id rowId
-		FROM
-			ds_form_page_data a
-		WHERE
-			a.sequence_id = #{id}
-		ORDER BY a.order_by ASC
-	</select>
 
 	<insert id="insertDsFormPageSequence" parameterType="java.util.Map">
 		INSERT INTO ds_form_page_sequence
-- 
GitLab