巡检记录增加设备筛选

@@ -49,7 +49,6 @@ public class InspectionTaskController {
      * @param inspectionTaskVO 巡检任务对象
      * @param pageNo           页码
      * @param pageSize         每页大小
-     * @param req
      * @author Xie Chao，2021-08-11 13:56
      */
     @AutoLog(value = "巡检任务-分页列表查询")
@@ -57,31 +56,36 @@ public class InspectionTaskController {
     @GetMapping(value = "/list")
     public Result<IPage<InspectionTask>> queryPageList(InspectionTaskVO inspectionTaskVO,
                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                       HttpServletRequest req) {
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         Result<IPage<InspectionTask>> result = new Result<>();
-        QueryWrapper<InspectionTask> queryWrapper = new QueryWrapper<>();
+//        QueryWrapper<InspectionTask> queryWrapper = new QueryWrapper<>();
+//        if (StringUtils.isNotBlank(inspectionTaskVO.getStartTime())
+//                && StringUtils.isNotBlank(inspectionTaskVO.getEndTime())) {
+//            queryWrapper.ge("inspection_cycle_start_date", inspectionTaskVO.getStartTime() + " 00:00:00");
+//            queryWrapper.le("inspection_cycle_start_date", inspectionTaskVO.getEndTime() + " 23:59:59");
+//        }
         if (StringUtils.isNotBlank(inspectionTaskVO.getStartTime())
                 && StringUtils.isNotBlank(inspectionTaskVO.getEndTime())) {
-            queryWrapper.ge("inspection_cycle_start_date", inspectionTaskVO.getStartTime() + " 00:00:00");
-            queryWrapper.le("inspection_cycle_start_date", inspectionTaskVO.getEndTime() + " 23:59:59");
-        }
-        if (StringUtils.isNotBlank(inspectionTaskVO.getTaskName())) {
-            queryWrapper.like("task_name", inspectionTaskVO.getTaskName());
-        }
-        if (StringUtils.isNotBlank(inspectionTaskVO.getTaskState())) {
-            queryWrapper.eq("task_state", inspectionTaskVO.getTaskState());
-        }
-        if (StringUtils.isNotBlank(inspectionTaskVO.getDepartId())) {
-            queryWrapper.eq("depart_id", inspectionTaskVO.getDepartId());
-        }
-        queryWrapper.eq("del_flag","1");
-        queryWrapper.orderByDesc("task_start_time");
-        if (inspectionTaskVO.getGroupName() != null && !"".equals(inspectionTaskVO.getGroupName())) {
-            queryWrapper.like("inspection_working_group_name", inspectionTaskVO.getInspectionWorkingGroupName());
-        }
+            inspectionTaskVO.setStartTime(inspectionTaskVO.getStartTime() + " 00:00:00");
+            inspectionTaskVO.setEndTime(inspectionTaskVO.getEndTime() + " 23:59:59");
+        }
+//        if (StringUtils.isNotBlank(inspectionTaskVO.getTaskName())) {
+//            queryWrapper.like("task_name", inspectionTaskVO.getTaskName());
+//        }
+//        if (StringUtils.isNotBlank(inspectionTaskVO.getTaskState())) {
+//            queryWrapper.eq("task_state", inspectionTaskVO.getTaskState());
+//        }
+//        if (StringUtils.isNotBlank(inspectionTaskVO.getDepartId())) {
+//            queryWrapper.eq("depart_id", inspectionTaskVO.getDepartId());
+//        }
+//        queryWrapper.eq("del_flag","1");
+//        queryWrapper.orderByDesc("task_start_time");
+//        if (inspectionTaskVO.getGroupName() != null && !"".equals(inspectionTaskVO.getGroupName())) {
+//            queryWrapper.like("inspection_working_group_name", inspectionTaskVO.getInspectionWorkingGroupName());
+//        }
         Page<InspectionTask> page = new Page<>(pageNo, pageSize);
-        IPage<InspectionTask> pageList = inspectionTaskService.page(page, queryWrapper);
+//        IPage<InspectionTask> pageList = inspectionTaskService.page(page, queryWrapper);
+        IPage<InspectionTask> pageList = inspectionTaskService.getPage(page, inspectionTaskVO);
         result.setSuccess(true);
         result.setResult(pageList);
         return result;

 package com.skua.modules.inspection.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.skua.core.aspect.annotation.Dict;

@@ -32,4 +32,6 @@ public interface InspectionTaskMapper extends BaseMapper<InspectionTask> {
 
     @Select("select * from equipment_info ${ew.customSqlSegment}")
     Map<String, Object> getEquipmentInfo(@Param(Constants.WRAPPER)QueryWrapper queryWrapper);
+
+    List<InspectionTask> getList(@Param("inspectionTaskVO") InspectionTaskVO inspectionTaskVO);
 }

@@ -10,4 +10,40 @@
         and fill_user_id = #{userId}
         group by fill_user_id,inspection_task_id)a
     </select>
+
+    <select id="getList" parameterType="com.skua.modules.inspection.vo.InspectionTaskVO" resultType="com.skua.modules.inspection.entity.InspectionTask">
+        select
+            *
+        from inspection_task
+        where inspection_plan_id in (
+            select inspection_plan_id
+            from inspection_plan_point
+            where inspection_point_id in (
+                select inspection_point_id
+                from inspection_point_fill_group
+                <if test="inspectionTaskVO.equipInfoId!=null and inspectionTaskVO.equipInfoId!=''">
+                    where equip_info_id = #{inspectionTaskVO.equipInfoId}
+                </if>
+                ))
+          and del_flag = 1
+        <if test="inspectionTaskVO.startTime !=null and inspectionTaskVO.startTime!=''">
+            and inspection_cycle_start_date BETWEEN #{inspectionTaskVO.startTime} and #{inspectionTaskVO.endTime}
+        </if>
+        <if test="inspectionTaskVO.taskName!=null and inspectionTaskVO.taskName!=''">
+            and task_name like CONCAT('%',#{inspectionTaskVO.taskName},'%')
+        </if>
+        <if test="inspectionTaskVO.taskState!=null and inspectionTaskVO.taskState!=''">
+            and task_state = #{inspectionTaskVO.taskState}
+        </if>
+        <if test="inspectionTaskVO.departId!=null and inspectionTaskVO.departId!=''">
+            and depart_id = #{inspectionTaskVO.departId}
+        </if>
+        <if test="inspectionTaskVO.groupName!=null and inspectionTaskVO.groupName!=''">
+            and inspection_working_group_name like CONCAT('%',#{inspectionTaskVO.groupName},'%')
+        </if>
+        <if test="inspectionTaskVO.inspectionWorkingGroupName!=null and inspectionTaskVO.inspectionWorkingGroupName!=''">
+            and inspection_working_group_name like CONCAT('%',#{inspectionTaskVO.inspectionWorkingGroupName},'%')
+        </if>
+        ORDER BY task_start_time desc
+    </select>
 </mapper>
\ No newline at end of file

@@ -2,6 +2,8 @@ package com.skua.modules.inspection.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.skua.modules.inspection.entity.InspectionTask;
 import com.skua.modules.inspection.vo.InspectionTaskVO;
@@ -35,4 +37,6 @@ public interface IInspectionTaskService extends IService<InspectionTask> {
     List<Map<String, Object>> getInspectionFill(String pipenetworkTubewellId, String taskId);
 
     boolean checkInspectionTriggerEquipQr(String equipmentInfoId, String code);
+
+    IPage<InspectionTask> getPage(Page<InspectionTask> page, InspectionTaskVO inspectionTaskVO);
 }

@@ -2,6 +2,8 @@ package com.skua.modules.inspection.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.skua.core.util.DateUtils;
 import com.skua.modules.inspection.entity.*;
@@ -787,6 +789,14 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
         return flag;
     }
 
+    @Override
+    public IPage<InspectionTask> getPage(Page<InspectionTask> page, InspectionTaskVO inspectionTaskVO) {
+        List<InspectionTask> list = this.baseMapper.getList(inspectionTaskVO);
+        page.setRecords(list);
+        page.setTotal(list.size());
+        return page;
+    }
+
     public List<Map<String, Object>> correctionInspectionTrack(List<Map<String, Object>> pointList) throws Exception {
         List<Map<String, Object>> resultList;
         String url = "http://api.map.baidu.com/rectify/v1/track";

@@ -158,4 +158,7 @@ public class InspectionTaskVO {
 
     /**班组名称*/
     private String groupName;
+
+    /**关联设备ID*/
+    private String equipInfoId;
 }
\ No newline at end of file