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/mapper/SgProjectInfoMapper.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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..8c38968 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
@@ -1,9 +1,8 @@
package cn.gistack.sm.sg.mapper;
-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 +24,37 @@
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<SgAllDeptOrUser> queryDept();
+
+ List<SgAllDeptOrUser> queryUser();
+
+
+ //List<String> getProjectIds(String code,@Param("grad") String grad );
}
--
Gitblit v1.9.3