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

aix

2024-08-28 f142d48409503dfd6b11d7d414c0ee7ffa85eed5

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/SgProjectInfoService.java

@@ -3,6 +3,9 @@
import cn.gistack.sm.sg.DO.SgProjectInfoDO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.VO.SgProjectInfoVO;
import cn.gistack.sm.sg.VO.SgStatisProVO;
import cn.gistack.sm.sg.VO.SgStatistccVO;
import cn.gistack.sm.sg.VO.SgStatisticsVO;
import cn.gistack.sm.sg.excel.ProjectExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -20,7 +23,7 @@
 */
public interface SgProjectInfoService extends IService<SgProjectInfoDO> {

   IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO);
   Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO);

   List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO);

@@ -33,4 +36,10 @@
   IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO);

   List<SgProjectInfoDO> listAll(ProjectSearchDTO searchDTO);

   SgStatisticsVO getsgStatistics(String code);

   List<SgStatisProVO> getsgStatisticsList(String code);

   List<SgStatistccVO> getsgStatisticscc(String code);
}