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/service/SgProjectInfoService.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 8174ded..94956b4 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
@@ -3,6 +3,10 @@
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;
@@ -19,11 +23,23 @@
*/
public interface SgProjectInfoService extends IService<SgProjectInfoDO> {
- IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO);
+ Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO);
List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO);
List<SgProjectInfoVO> progressList(ProjectSearchDTO searchDTO);
- Map<String, Long> projectCount(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