我的学习按资料名类型查询

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -418,7 +418,7 @@ public class CmcProjectController extends BaseController
 
     //各部门承担项目数量
     public void getProjectDeptStatistic(CmcProject cmcProject, JSONObject deptObject) {
-        for (int i = 107; i <= 116; i++) {
+        for (int i = 107; i <= 115; i++) {
             cmcProject.setUndertakingDept(String.valueOf(i));
             List<CmcProject> deptList = new ArrayList<>();
             if (i != 113)

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcStudyMapper.xml

@@ -49,6 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lastPoint != null  and lastPoint != ''"> and s.last_point = #{lastPoint}</if>
             <if test="lastTime != null "> and YEAR(s.last_time) = YEAR(#{lastTime})</if>
             <if test="getHours != null "> and s.get_hours = #{getHours}</if>
+            <if test="title != null "> and r.title like concat('%', #{title}, '%')</if>
+            <if test="type != null "> and r.type like concat('%', #{type}, '%')</if>
         </where>
     </select>