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

ke

2024-08-27 f73dbcd6c21d28ab1e98840eee73c6d09bd0f929

 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;
@@ -39,4 +40,6 @@
   List<SgProgressReportVO> queryPageListAll(@Param("page") IPage<SgProgressReportVO> page, @Param("dto") ProjectSearchDTO searchDTO);

   Long selectProframId(Long deviceId);

   List<SgReportUserDO> selectProcessUserByProjectId(@Param("programId") Long programId);
}