From a53698bd26551485c9506e874e8258dab6dd4a41 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Fri, 30 Dec 2022 11:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E8=8F=9C=E5=8D=95=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=B8=8B=E7=A7=BB=E5=8A=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=87=E8=AF=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_2nd_period.sql   |  3 +++
 .../split/entity/SarFileSplitMenuEO.java      |  5 +++++
 .../impl/SarFileSplitMenuEOServiceImpl.java   | 22 ++++++++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index b7f74da69..fcd8255c7 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -156,3 +156,6 @@ ALTER TABLE `laws_weilai`.`params_manifest_history`
 -- 上报库备注列字段长度修改  2022-12-29 未同步生产环境
 ALTER TABLE `laws_weilai`.`params_report_detail`
     MODIFY COLUMN `remarks` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `title_default_value`;
+
+-- 更新拆分详情列   展示顺序不在列表头展示sql    2022-12-30 未同步生产环境
+UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '1529373706885799937'
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java
index 85120386f..a10112eb2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitMenuEO.java
@@ -41,4 +41,9 @@ public class SarFileSplitMenuEO implements Serializable {
     private Long childrenCount;
 
     private List<SarFileSplitMenuEO> children = new ArrayList<>();
+
+    // 向上移动标识
+    private boolean moveUpFlag;
+    // 向下移动标识
+    private boolean moveDownFlag;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index fa2ebdc89..58828fc5c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -166,7 +166,27 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
 
     @Override
     public List<SarFileSplitMenuEO> queryByList(SarFileSplitMenuEOPage page) {
-        return dao.queryByList(page);
+        List<SarFileSplitMenuEO> result = dao.queryByList(page);
+
+        // 处理数据是否可以上下移动标识
+        for (SarFileSplitMenuEO sarFileSplitMenuEO : result) {
+            // 如果数据的同级别  该数据是第一条数据，不能向上移动， 该数据是最后一条数据 不能向下移动， 如果该级别只有这一条数据，不可向上或向下移动
+            boolean moveUpFlag = false;
+            boolean moveDownFlag = false;
+            Long displaySeq = sarFileSplitMenuEO.getDisplaySeq();
+            for (SarFileSplitMenuEO fileSplitMenuEO : result) {
+                if(StringUtils.equals(sarFileSplitMenuEO.getPId(),fileSplitMenuEO.getPId())){
+                    if(displaySeq > fileSplitMenuEO.getDisplaySeq()){
+                        moveUpFlag = true;
+                    }else if(displaySeq < fileSplitMenuEO.getDisplaySeq()){
+                        moveDownFlag = true;
+                    }
+                }
+            }
+            sarFileSplitMenuEO.setMoveUpFlag(moveUpFlag);
+            sarFileSplitMenuEO.setMoveDownFlag(moveDownFlag);
+        }
+        return result;
     }
 
     @Override