From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java
index 332ad8e..50193e7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.java
@@ -3,7 +3,7 @@
import cn.gistack.sm.sg.DO.SgGxStepDO;
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.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -25,4 +25,32 @@
List<SgProjectInfoVO> queryStepByProject(@Param("dto") ProjectSearchDTO searchDTO);
List<SgProjectInfoVO> progressList(@Param("dto") ProjectSearchDTO searchDTO);
+
+ List<SgProjectInfoVO> progressList(IPage<SgProjectInfoVO> page, @Param("dto") ProjectSearchDTO searchDTO);
+
+ SgStatisticsVO getSgstatiss(@Param("grad") String grad, String code);
+
+ List<SgStatisProVO> getsgStatisticsList(String code);
+
+ List<SgStatisProVO> getsgStatisticsZero(String code);
+
+ List<SgStatisProVO> getsgStatisticsOne(String code);
+
+ List<String> getProjectId(@Param("grad") String grad,@Param("code") String code);
+
+ List<SgStatistccVO> getSgdevices(@Param("code")String code,@Param("grad") String adGrad);
+
+ String getname(String code);
+
+ List<SgProjectInfoVO> progressList1(IPage<SgProjectInfoVO> page, @Param("dto") ProjectSearchDTO dto);
+
+ List<SgProjectInfoVO> queryStepByProject1(@Param("dto") ProjectSearchDTO searchDTO);
+
+ SgProjectInfoVO selectVOById(@Param("proframId") Long proframId);
+
+ String getSgCodeByUser(String id);
+
+ List<SgStatisDeviceVO> getDeviceTypes(@Param("s") String s);
+
+ //List<String> getProjectIds(String code,@Param("grad") String grad );
}
--
Gitblit v1.9.3