From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProjectInfoService.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProjectInfoService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProjectInfoService.java
index 56690fe..2447605 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProjectInfoService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProjectInfoService.java
@@ -1,10 +1,17 @@
 package cn.gistack.sm.sg.service;
 
-import cn.gistack.sm.patrol.entity.PatrolInfo;
 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 com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +24,22 @@
 public interface SgProjectInfoService extends IService<SgProjectInfoDO> {
 
 	IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO);
+
+	List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO);
+
+	List<SgProjectInfoVO> progressList(ProjectSearchDTO searchDTO);
+
+	Map<String, Object> projectCount(ProjectSearchDTO searchDTO);
+
+    void importProject(List<ProjectExcel> data, Boolean isCovered);
+
+	IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO);
+
+	List<SgProjectInfoDO> listAll(ProjectSearchDTO searchDTO);
+
+	SgStatisticsVO getsgStatistics(String code);
+
+	List<SgStatisProVO> getsgStatisticsList(String code);
+
+	List<SgStatistccVO> getsgStatisticscc(String code);
 }

--
Gitblit v1.9.3