分页处理

guoshilong

2023-04-04 3e7f2ef80c9fe9853889824aa99b37ccc13b75e9

分页处理

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/exam/mapper/ExamPlanMapper.java

@@ -4,6 +4,7 @@

import cn.gistack.sm.exam.entity.ExamPlan;
import cn.gistack.sm.exam.vo.ExamPlanVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,7 +20,7 @@
     * @param examPlan 考核方案 vo 对象
     * @return
     */
    List<ExamPlanVO> selectExamPlanPage(@Param("examPlan") ExamPlan examPlan);
    List<ExamPlanVO> selectExamPlanPage(IPage<ExamPlanVO> page,@Param("examPlan") ExamPlan examPlan);

    /**
     * 设置启用或者禁用

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/exam/service/impl/ExamPlanServiceImpl.java

@@ -48,7 +48,7 @@
     */
    @Override
    public IPage<ExamPlanVO> selectExamPlanPage(IPage<ExamPlanVO> page, ExamPlan examPlan){
        return page.setRecords(baseMapper.selectExamPlanPage(examPlan));
        return page.setRecords(baseMapper.selectExamPlanPage(page,examPlan));
    }

    @Override

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.patrol.entity.PatrolConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -11,5 +12,5 @@
 */
public interface PatrolConfigMapper extends BaseMapper<PatrolConfig> {

    List<PatrolConfig> selectPatrolConfig(@Param("patrolConfig") PatrolConfig patrolConfig);
    List<PatrolConfig> selectPatrolConfig(IPage<PatrolConfig> page, @Param("patrolConfig") PatrolConfig patrolConfig);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.java

@@ -1,14 +1,16 @@
package cn.gistack.sm.patrol.mapper;

import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface PatrolRecordMapper extends BaseMapper<PatrolRecord> {
    List<PatrolRecord> selectPatrolRecord(@Param("patrolRecord") PatrolRecord patrolRecord);
    List<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page,@Param("patrolRecord") PatrolRecord patrolRecord);

    PatrolRecordVO getDetail(@Param("id") String id);


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml

@@ -25,7 +25,7 @@
    <select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
        SELECT record.id,record.patrol_type,record.device_ids,
        record.images,
        record.content,record.status,record.item_id,record.task_id,record.patrol_route,route.ROUTE_COORDINATES taskRoute
        record.content,record.status,record.item_id,record.task_id,record.patrol_route,dmgeo.ST_AsGeoJSON(task.route_coordinates) taskRoute
        FROM SM_PATROL_RECORD record
        LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
        LEFT JOIN sm_patrol_task task ON task.id = record.task_id

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java

@@ -4,6 +4,7 @@
import cn.gistack.sm.patrol.vo.PatrolTaskStatisticsVO;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -16,7 +17,7 @@
     * @param patrolTask
     * @return
     */
    List<PatrolTaskVO> selectPatrolTask(@Param("patrolTask") PatrolTaskVO patrolTask);
    List<PatrolTaskVO> selectPatrolTask(IPage<PatrolTaskVO> page,@Param("patrolTask") PatrolTaskVO patrolTask);

    /**
     * 查询巡查人员统计数据信息

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTypeMapper.java

@@ -2,6 +2,7 @@

import cn.gistack.sm.patrol.entity.PatrolType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -11,5 +12,5 @@
 */
public interface PatrolTypeMapper extends BaseMapper<PatrolType> {

    List<PatrolType> selectPatrolType(@Param("patrolType") PatrolType patrolType);
    List<PatrolType> selectPatrolType(IPage<PatrolType> page,@Param("patrolType") PatrolType patrolType);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolConfigServiceImpl.java

@@ -15,6 +15,6 @@

    @Override
    public IPage<PatrolConfig> selectPatrolConfig(IPage<PatrolConfig> page, PatrolConfig patrolConfig) {
        return page.setRecords(baseMapper.selectPatrolConfig(patrolConfig));
        return page.setRecords(baseMapper.selectPatrolConfig(page,patrolConfig));
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolRecordServiceImpl.java

@@ -27,7 +27,7 @@

    @Override
    public IPage<PatrolRecord> selectPatrolRecord(IPage<PatrolRecord> page, PatrolRecord patrolRecord) {
        return page.setRecords(baseMapper.selectPatrolRecord(patrolRecord));
        return page.setRecords(baseMapper.selectPatrolRecord(page,patrolRecord));
    }

    @Override

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java

@@ -24,7 +24,7 @@
     */
    @Override
    public IPage<PatrolTaskVO> selectPatrolTask(IPage<PatrolTaskVO> page, PatrolTaskVO patrolTask) {
        return page.setRecords(baseMapper.selectPatrolTask(patrolTask));
        return page.setRecords(baseMapper.selectPatrolTask(page,patrolTask));
    }

    /**

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTypeServiceImpl.java

@@ -17,6 +17,6 @@

    @Override
    public IPage<PatrolType> selectPatrolType(IPage<PatrolType> page, PatrolType patrolType) {
        return page.setRecords(baseMapper.selectPatrolType(patrolType));
        return page.setRecords(baseMapper.selectPatrolType(page,patrolType));
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java

@@ -6,17 +6,38 @@
@Data
public class PatrolRecordVO extends PatrolRecord {

    /**
     * 任务巡查路线
     */
    private String taskRoute;

    /**
     * 组名称
     */
    private String groupName;

    /**
     * 组id
     */
    private String groupId;

    /**
     * 项名称
     */
    private String itemsName;

    /**
     * 项描述
     */
    private String description;

    /**
     * 巡查时间
     */
    private String patrolTime;

    /**
     * 巡查人id
     */
    private String toUserId;
}