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/mapper/SgProgressReportMapper.java

@@ -26,6 +26,7 @@
   SgProgressReportVO queryById(@Param("id") String id);

   List<SgProgressReportVO> queryList(@Param("dto") ProjectSearchDTO searchDTO);
   List<SgProgressReportVO> queryList(IPage<SgProgressReportVO> page,@Param("dto") ProjectSearchDTO searchDTO);

   Long countList(@Param("dto") ProjectSearchDTO searchDTO);

@@ -34,4 +35,8 @@
   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);
}