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 |   98 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 91 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 eca12d0..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
@@ -3,16 +3,23 @@
 import cn.gistack.sm.sg.DO.SgProjectInfoDO;
 import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
 import cn.gistack.sm.sg.VO.SgProjectInfoVO;
+import cn.gistack.sm.sg.VO.SgStatisProVO;
+import cn.gistack.sm.sg.VO.SgStatistccVO;
+import cn.gistack.sm.sg.VO.SgStatisticsVO;
+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;
+import org.springblade.core.excel.util.ExcelUtil;
 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.GetMapping;
-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;
 import java.util.Map;
@@ -33,10 +40,23 @@
 	/**
 	 * 分页列表查询
 	 */
-	@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);
+	}
+
+
+	/**
+	 * 查询所有接口
+	 */
+	@GetMapping(value = "/list_all")
+	public R queryPageList(ProjectSearchDTO searchDTO) {
+		List<SgProjectInfoDO> list = sgProjectInfoService.listAll(searchDTO);
+		return R.data(list);
 	}
 
 	/**
@@ -59,11 +79,75 @@
 	}
 
 	/**
+	 * 项目进度列表（分页）
+	 */
+	@GetMapping(value = "/project_progress_page")
+	public R progressPage(ProjectSearchDTO searchDTO,Query query) {
+		IPage<SgProjectInfoVO> page= sgProjectInfoService.progressPage(Condition.getPage(query),searchDTO);
+		return R.data(page);
+	}
+
+	/**
 	 * 首页项目统计（APP）
 	 */
 	@GetMapping(value = "/project_count")
 	public R projectCount(ProjectSearchDTO searchDTO) {
-		Map<String,Long> map = sgProjectInfoService.projectCount(searchDTO);
+		Map<String,Object> map = sgProjectInfoService.projectCount(searchDTO);
 		return R.data(map);
 	}
+
+	/**
+	 * 导入项目
+	 */
+	@PostMapping("import_project")
+	public R importUser(MultipartFile file, Integer isCovered) {
+		ProjectImport projectImport = new ProjectImport(sgProjectInfoService, isCovered == 1);
+		ExcelUtil.save(file, projectImport, ProjectExcel.class);
+		return R.success("操作成功");
+	}
+
+	/**
+	 * 统计项目饼状图
+	 */
+	@GetMapping("statisticsce")
+	public R projectStatisSum(String code) {
+		SgStatisticsVO sgStatisticsVO =	sgProjectInfoService.getsgStatistics(code);
+		return R.data(sgStatisticsVO);
+	}
+
+	/**
+	 * 统计项目图列表
+	 */
+	@GetMapping("statisticsBarlist")
+	public R projectStatisList(String code) {
+		 List<SgStatisProVO> sgStatisProVOS  =	sgProjectInfoService.getsgStatisticsList(code);
+		return R.data(sgStatisProVOS);
+	}
+
+	/**
+	 * 统计项目柱状图
+	 */
+	@GetMapping("statisticsBar")
+	public R projectStatis(String code) {
+		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