From 9f204e8842e1688858889a67b702d9e19bb18b15 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 02 Dec 2024 10:55:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java
index 9d16934..af8215b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.sg.mapper;
import cn.gistack.sm.sg.DO.SgProgressReportDO;
+import cn.gistack.sm.sg.DO.SgReportUserDO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.VO.SgProgressReportVO;
import cn.gistack.sm.sg.VO.SgStepReportVO;
@@ -35,4 +36,16 @@
List<SgProgressReportVO> statusCount(@Param("dto") ProjectSearchDTO searchDTO);
List<Map<String, Object>> getUserByIds(@Param("ids") List<Long> ids);
+
+ List<SgProgressReportVO> queryPageListAll(@Param("page") IPage<SgProgressReportVO> page, @Param("dto") ProjectSearchDTO searchDTO);
+
+ Long selectProframId(Long deviceId);
+
+ List<SgReportUserDO> selectProcessUserByProjectId(@Param("programId") Long programId);
+
+ List<Map<String, Object>> getRoleByIds(@Param("ids")List<Long> rids);
+
+ List<Long> getSgEngineerRole();
+
+ List<Map<String, Object>> getUserByIdsCounty(@Param("ids") List<Long> ids);
}
--
Gitblit v1.9.3