From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001 From: ke <893754509@qq.com> Date: Fri, 19 Jul 2024 12:25:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev --- skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProgressReportService.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProgressReportService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProgressReportService.java index 1dc9cf5..66a0ef1 100644 --- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProgressReportService.java +++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProgressReportService.java @@ -4,6 +4,7 @@ import cn.gistack.sm.sg.DTO.ApprovalDTO; import cn.gistack.sm.sg.DTO.ProjectSearchDTO; import cn.gistack.sm.sg.VO.SgProgressReportVO; +import cn.gistack.sm.sg.VO.SgReportVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -22,6 +23,8 @@ IPage<SgProgressReportVO> queryPageList(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO); + IPage<SgProgressReportVO> queryPageListAll(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO); + void add(SgProgressReportDO sgProgressReportDO); SgProgressReportVO detail(String id); @@ -34,6 +37,8 @@ Map<String, Long> countList(ProjectSearchDTO searchDTO); + Map<String, Long> countListAll(ProjectSearchDTO searchDTO); + Map<String, Long> statusCount(ProjectSearchDTO searchDTO); boolean checkStep(Long deviceId, Long stepId); @@ -41,4 +46,7 @@ IPage<SgProgressReportVO> progressPage(IPage<SgProgressReportVO> page, ProjectSearchDTO searchDTO); String getDeviceReport(Long deviceId, Long stepId); + + + SgReportVO getDeviceReportcopy(Long deviceId, Long stepId); } -- Gitblit v1.9.3