Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 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);
}