优秀案例管理页面优化

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillTaskController.java

@@ -127,19 +127,19 @@ public class CoreDrillTaskController extends BaseController {
         return success(coreDrillTaskService.evaluate(request));
     }
 
-    @ApiOperation(value = "优秀案例管理分页",notes = "需要被确认的优秀案例")
-    @RequiresPermissions("core:drillTask:list")
-    @PostMapping("/recList")
-    public TableDataInfo<CoreDrillTaskRecPageVo> recList(@RequestBody @Validated CoreDrillTaskRecPageDto request) {
-        return coreDrillTaskService.recList(request);
-    }
-
-    @ApiOperation(value = "优秀案例分页",notes = "已经被确认的优秀案例")
+//    @ApiOperation(value = "优秀案例管理分页",notes = "需要被确认的优秀案例")
 //    @RequiresPermissions("core:drillTask:list")
-    @PostMapping("/recTaskList")
-    public TableDataInfo<CoreDrillTaskRecTaskPageVo> recTaskList(@RequestBody @Validated CoreDrillTaskRecPageDto request) {
-        return coreDrillTaskService.recTaskList(request);
-    }
+//    @PostMapping("/recList")
+//    public TableDataInfo<CoreDrillTaskRecPageVo> recList(@RequestBody @Validated CoreDrillTaskRecPageDto request) {
+//        return coreDrillTaskService.recList(request);
+//    }
+
+//    @ApiOperation(value = "优秀案例分页",notes = "已经被确认的优秀案例")
+////    @RequiresPermissions("core:drillTask:list")
+//    @PostMapping("/recTaskList")
+//    public TableDataInfo<CoreDrillTaskRecTaskPageVo> recTaskList(@RequestBody @Validated CoreDrillTaskRecPageDto request) {
+//        return coreDrillTaskService.recTaskList(request);
+//    }
 
     @ApiOperation(value = "优秀案例推荐",notes = "推荐优秀案例")
     //@RequiresPermissions("core:drillTask:edit")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -961,14 +961,14 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
 
         //App的查询, App 默认下穿
         request.setCheckSub(true);
-        if (ObjectUtil.isNotEmpty(request.getRecStatus())) {
-            if (isUnRecStatus(request.getRecStatus())) {
-                request.setUnRecStatus(request.getRecStatus());
-                request.setRecStatus(null);
-            } else {
-                request.setUnRecStatus(null);
-            }
-        }
+//        if (ObjectUtil.isNotEmpty(request.getRecStatus())) {
+//            if (isUnRecStatus(request.getRecStatus())) {
+//                request.setUnRecStatus(request.getRecStatus());
+//                request.setRecStatus(null);
+//            } else {
+//                request.setUnRecStatus(null);
+//            }
+//        }
         //App端的时间按季度查询
         request.setStartTime(DateUtil.beginOfMonth(request.getStartTime()));
         request.setEndTime(DateUtil.endOfMonth(request.getEndTime()));

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillTaskMapper.xml

@@ -196,11 +196,14 @@
     <select id="selectRecPage" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecPageVo">
         select * from core_drill_task t
         where t.rec_status is not null
-        <if test="request.recStatus!=null">
-            and t.rec_status =#{request.recStatus} and t.unrec_status is null
+        <if test="request.recStatus!=null and request.unRecStatus==null">
+            and t.rec_status = #{request.recStatus} AND t.unrec_status is null
+        </if>
+        <if test="request.recStatus!=null and request.unRecStatus!=null">
+            and t.rec_status = #{request.recStatus} and t.unrec_status = #{request.unRecStatus}
         </if>
-        <if test="request.unRecStatus!=null">
-            and t.unrec_status =#{request.unRecStatus}
+        <if test="request.drillType!=null">
+            and t.type =#{request.drillType}
         </if>
         and t.org_path like concat(#{request.orgPath},'%')
         <include refid="timeRangeSql"/>
@@ -220,9 +223,18 @@
     <select id="selectRecTaskListPage" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillTaskRecTaskPageVo">
         select id,org_name,drill_start_time,drill_end_time,type from core_drill_task t
         where drill_start_time is not null
-        <include refid="recTaskListPage"/>
-
-
+        <if test="request.orgPath !=null and request.orgPath != ''">
+            and t.org_path like concat(#{request.orgPath},'%')
+        </if>
+        <if test="request.recStatus!=null and request.unRecStatus==null">
+            and t.rec_status = #{request.recStatus} AND t.unrec_status is null
+        </if>
+        <if test="request.recStatus!=null and request.unRecStatus!=null">
+            and t.rec_status = #{request.recStatus} and t.unrec_status = #{request.unRecStatus}
+        </if>
+        <if test="request.drillType!=null">
+            and t.type =#{request.drillType}
+        </if>
         <if test="request.startTime != null and request.endTime != null">
             and (
             (