Merge remote-tracking branch 'origin/fix_2nd_period' into fix_2nd_period

2022-12-30 11:59:42 +08:00
parent a9118dc7b7 c95d92d704
commit 2e1cb43985
3 changed files with 29 additions and 1 deletions
@@ -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'
@@ -41,4 +41,9 @@ public class SarFileSplitMenuEO implements Serializable {
    private Long childrenCount;

    private List<SarFileSplitMenuEO> children = new ArrayList<>();
+
+    // 向上移动标识
+    private boolean moveUpFlag;
+    // 向下移动标识
+    private boolean moveDownFlag;
 }
@@ -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