From f142d48409503dfd6b11d7d414c0ee7ffa85eed5 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Wed, 28 Aug 2024 14:28:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
index 480e067..ed1070d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/controller/SgProjectInfoController.java
@@ -9,6 +9,7 @@
import cn.gistack.sm.sg.excel.ProjectExcel;
import cn.gistack.sm.sg.excel.ProjectImport;
import cn.gistack.sm.sg.service.SgProjectInfoService;
+import cn.gistack.sm.sjztmd.entity.AttResBase;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.ApiOperation;
import org.springblade.core.boot.ctrl.BladeController;
@@ -17,10 +18,7 @@
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.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -42,9 +40,12 @@
/**
* 分页列表查询
*/
- @GetMapping(value = "/list")
- public R queryPageList(ProjectSearchDTO searchDTO, Query query) {
- IPage<SgProjectInfoDO> page = sgProjectInfoService.queryPageList(Condition.getPage(query), searchDTO);
+ @PostMapping(value = "/list")
+ public R queryPageListPage(@RequestBody ProjectSearchDTO searchDTO) {
+ Query query = new Query();
+ query.setCurrent(searchDTO.getCurrent());
+ query.setSize(searchDTO.getSize());
+ Object page = sgProjectInfoService.queryPageList(Condition.getPage(query), searchDTO);
return R.data(page);
}
@@ -131,4 +132,22 @@
List<SgStatistccVO> sgStatisProVOS = sgProjectInfoService.getsgStatisticscc(code);
return R.data(sgStatisProVOS);
}
+
+ /**
+ * 新增项目
+ */
+ @PostMapping("add")
+ public R add(@RequestBody SgProjectInfoDO sgProjectInfoDO) {
+ sgProjectInfoService.save(sgProjectInfoDO);
+ return R.success("新增成功");
+ }
+
+ /**
+ * 新增项目
+ */
+ @PostMapping("update")
+ public R update(@RequestBody SgProjectInfoDO sgProjectInfoDO) {
+ sgProjectInfoService.updateById(sgProjectInfoDO);
+ return R.success("修改成功");
+ }
}
--
Gitblit v1.9.3