Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 7289189c907038db99d41aefcd9e12dce5077d3e

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFeasibilityStudyReportMapper.java

@@ -8,6 +8,7 @@
import org.apache.ibatis.annotations.Param;

import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -26,4 +27,20 @@
     * @return
     */
    List<TFeasibilityStudyReportVO> pageList(@Param("query") TFeasibilityStudyReportQuery query, @Param("pageInfo")PageInfo<TFeasibilityStudyReportVO> pageInfo);

    /**
     * 课题评定分页查询可研、可行、工艺开发工具、验证发布报告管理
     * @param query
     * @param pageInfo
     * @return
     */
    List<TFeasibilityStudyReportVO> evaluatePageList(@Param("query")TFeasibilityStudyReportQuery query, @Param("pageInfo")PageInfo<TFeasibilityStudyReportVO> pageInfo);

    /**
     * 课题评定数量统计
     * @param query
     * @return
     */
    Map<String, Integer> evaluateCount(@Param("query")TFeasibilityStudyReportQuery query);

}