From bfe4e6e49ea341c8443d7b4b70cb66de0f1aadab Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 03 Dec 2024 09:53:22 +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 | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 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 f510e15..a0ba307 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,8 +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.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -20,4 +20,47 @@
public interface SgProjectInfoMapper extends BaseMapper<SgProjectInfoDO> {
List<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, @Param("dto") ProjectSearchDTO dto);
+
+ 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<SgProjectTreeVO> projectTree(@Param("dto") ProjectSearchDTO dto);
+
+ List<String> getUserS(@Param("list") List<String> controlUnit);
+
+ List<ResVO> resList(IPage<ResVO> page, @Param("dto") ProjectSearchDTO dto);
+
+
+ //List<String> getProjectIds(String code,@Param("grad") String grad );
}
--
Gitblit v1.9.3