From 98fa36c7b9865675945f81cdd718c2f835ab666b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 1 Jul 2022 16:32:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=A0=87=E9=A2=98=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF--=E4=B8=8A=E7=A7=BB=E4=B8=8B=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...wsMonthlyReportTitleTemplateEOController.java | 13 +++++++++++++
 .../entity/LawsMonthlyReportTitleTemplateEO.java |  4 ----
 ...ILawsMonthlyReportTitleTemplateEOService.java |  8 +++++++-
 ...sMonthlyReportTitleTemplateEOServiceImpl.java | 16 ++++++++++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
index 57cf0fd29..b5ecaf9ed 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java
@@ -181,4 +181,17 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController<L
 		 return Result.OK(list);
 	 }
 
+	 /**
+	  * 上移下移
+	  * @param lawsMonthlyReportTitleTemplateEOS
+	  * @return
+	  */
+	 @AutoLog(value = "上移下移")
+	 @ApiOperation(value="上移下移", notes="上移下移")
+	 @PostMapping(value = "/move")
+	 public Result<?> move(@RequestBody List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS) {
+		 lawsMonthlyReportTitleTemplateEOService.move(lawsMonthlyReportTitleTemplateEOS);
+		 return Result.OK("操作成功！");
+	 }
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
index af530b5e5..ab1b5a6c6 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java
@@ -79,10 +79,6 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable {
 	@TableField(exist = false)
 	private List<LawsMonthlyReportTitleTemplateEO> children = new ArrayList<>();
 
-	//标识(上移-->0,下移-->1)
-    @TableField(exist = false)
-	private String flag;
-
     //排序
     private int sort;
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java
index b0272fd65..51def4c31 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java
@@ -72,7 +72,13 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService<LawsM
 	IPage<LawsMonthlyReportTitleTemplateEO> getPageInfo(Integer pageNo,Integer pageSize, QueryWrapper<LawsMonthlyReportTitleTemplateEO> queryWrapper);
 
 	/**
-	 * 以及菜单
+	 * 一级菜单
 	 */
 	List<LawsMonthlyReportTitleTemplateEO> OneMenuList();
+
+	/**
+	 * 上移下移
+	 * @param lawsMonthlyReportTitleTemplateEOS
+	 */
+	void move(List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS);
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
index 8efdd7896..1205023c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java
@@ -159,6 +159,22 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl<Law
 		return this.list(wrapper);
 	}
 
+	/**
+	 * 上移,下移
+	 * @param lawsMonthlyReportTitleTemplateEOS
+	 */
+	@Override
+	public void move(List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS) {
+		//上移,下移(交换sort)
+		if(lawsMonthlyReportTitleTemplateEOS.size() == 2){
+			int one = lawsMonthlyReportTitleTemplateEOS.get(0).getSort();
+			int two = lawsMonthlyReportTitleTemplateEOS.get(1).getSort();
+			lawsMonthlyReportTitleTemplateEOS.get(0).setSort(two);
+			lawsMonthlyReportTitleTemplateEOS.get(1).setSort(one);
+		}
+		this.updateBatchById(lawsMonthlyReportTitleTemplateEOS);
+	}
+
 	public Page getPages(Integer currentPage, Integer pageSize, List<LawsMonthlyReportTitleTemplateEO> list){
 		Page page =new Page();
 		if(list==null){