From a70a81b036cbcd8516ace15f3ae3c57e779d29f5 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Fri, 14 Jun 2024 18:07:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgGxStepController.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgGxStepController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgGxStepController.java
index f9fd395..43ed27f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgGxStepController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgGxStepController.java
@@ -1,8 +1,13 @@
 package cn.gistack.sm.sg.controller;
 
 import cn.gistack.sm.sg.DO.SgGxStepDO;
+import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
+import cn.gistack.sm.sg.VO.SgGxVO;
 import cn.gistack.sm.sg.service.SgGxStepService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -47,4 +52,21 @@
 		sgGxStepService.delete(id);
 		return R.success("删除成功");
 	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping(value = "/page")
+	public R queryPageList(ProjectSearchDTO searchDTO, Query query) {
+		IPage<SgGxStepDO> page = sgGxStepService.queryPageList(Condition.getPage(query), searchDTO);
+		return R.data(page);
+	}
+
+	/**
+	 * 详情
+	 */
+	@GetMapping(value = "/detail")
+	public R queryPageList(String id) {
+		return R.data(sgGxStepService.getById(id));
+	}
 }

--
Gitblit v1.9.3