修正分页错误

src/main/java/io/renren/modules/admin/controller/MeetingController.java

@@ -70,10 +70,7 @@ public class MeetingController {
    @RequestMapping("/listtest")
    @RequiresPermissions("admin:meeting:list")
    public R listtest(@RequestParam Map<String, Object> params){
        String key = (String) params.get("key");
        int p = Integer.valueOf(params.get("page").toString());
        int l = Integer.valueOf(params.get("limit").toString());
        PageUtils page = meetingService.queryList(p, l, key);
        PageUtils page = meetingService.myQueryPage(params);
        return R.ok().put("page", page);
    }

src/main/java/io/renren/modules/admin/dao/AttendersDao.java

@@ -19,8 +19,8 @@ import org.apache.ibatis.annotations.Update;
 */
@Mapper
public interface AttendersDao extends BaseMapper<AttendersEntity> {
    @Select("SELECT a.id, m.truename as name, m.organization, m.phone, a.intention, a.room, a.transfer, a.note, a.modify_time, a.servicer, e.truename as servicerName, a.type_id as typeId, (select t.name from types_of_attenders t WHERE t.id=a.type_id) as typeName, (SELECT p.is_pay FROM  payment p WHERE p.attenders_id=a.id) as  isPay  FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND (m.truename Like '%${truename}%' OR m.organization LIKE '%${organization}%') limit #{page},#{limit};")
    List<Map<String, Object>> getMapList(Long meetingId, String truename, String organization, int page, int limit);
    @Select("SELECT a.id, m.truename as name, m.organization, m.phone, a.intention, a.room, a.transfer, a.note, a.modify_time, a.servicer, e.truename as servicerName, a.type_id as typeId, (select t.name from types_of_attenders t WHERE t.id=a.type_id) as typeName, (SELECT p.is_pay FROM  payment p WHERE p.attenders_id=a.id) as  isPay  FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND (m.truename Like '%${truename}%' OR m.organization LIKE '%${organization}%') limit #{startLimt},#{endLimt};")
    List<Map<String, Object>> getPageList(Long meetingId, String truename, String organization, int startLimt, int endLimt);
    @Select("SELECT count(*) FROM attenders a JOIN member m ON a.member_id=m.id LEFT JOIN employee e ON e.id=a.servicer  WHERE a.is_del=0 AND a.meeting_id=#{meetingId} AND (m.truename Like '%${truename}%' OR m.organization LIKE '%${organization}%');")
    int getCounts(Long meetingId, String truename, String organization);

src/main/java/io/renren/modules/admin/dao/LectureDao.java

@@ -18,8 +18,8 @@ import org.apache.ibatis.annotations.Select;
 */
@Mapper
public interface LectureDao extends BaseMapper<LectureEntity> {
    @Select("select l.id,a.id a_id,a.meeting_id,l.topic,l.branch_id,l.speech_time,m.truename,m.position,m.job_title,m.organization from attenders a join lecture l on a.id=l.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del=0 and l.is_del=0 and (l.topic like '%${key1}' or m.truename like '%${key2}%') limit #{page},#{limit};")
    List<Map<String, Object>> getPageList(Long meetingId, String key1, String key2, int page, int limit);
    @Select("select l.id,a.id a_id,a.meeting_id,l.topic,l.branch_id,l.speech_time,m.truename,m.position,m.job_title,m.organization from attenders a join lecture l on a.id=l.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del=0 and l.is_del=0 and (l.topic like '%${key1}' or m.truename like '%${key2}%') limit #{startLimt},#{endLimt};")
    List<Map<String, Object>> getPageList(Long meetingId, String key1, String key2, int startLimt, int endLimt);
    @Select("select count(*) from attenders a join lecture l on a.id=l.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del=0 and l.is_del=0 and (l.topic like '%${key1}%' or m.truename like '%${key2}%'); ")
    int getCounts(Long meetingId, String key1, String key2);

src/main/java/io/renren/modules/admin/dao/MeetingDao.java

@@ -23,8 +23,8 @@ public interface MeetingDao extends BaseMapper<MeetingEntity> {
    int updateStatus(Long id, Integer isCheck);
    @Select("select m.id,c.companyname,m.name_cn,m.address,m.start_time from meeting as m left JOIN company as c on m.company_id = c.id where m.is_del = 0 and (m.name_cn LIKE '%${key}%' or m.name_en LIKE '%${key2}%') limit #{page},#{limit} ")
    List<Map<String, Object>> queryCN(int page, int limit, String key, String key2);
    List<Map<String, Object>> getPageList(int page, int limit, String key, String key2);
    @Select("select count(*) from meeting  where is_del = 0 and (name_cn LIKE '%${key}%' or name_en LIKE '%${key2}%')")
    Integer queryCNCOUNTS(String key, String key2);
    Integer getCounts(String key, String key2);
}

src/main/java/io/renren/modules/admin/dao/PaperDao.java

@@ -18,8 +18,8 @@ import org.apache.ibatis.annotations.Select;
 */
@Mapper
public interface PaperDao extends BaseMapper<PaperEntity> {
    @Select("select p.id,p.title,a.id a_id,m.truename,m.phone,m.email,p.paperurl,p.create_time from attenders a join paper p on a.id=p.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del =0 and p.is_del = 0 and (p.title like '%${key1}%' or m.truename LIKE '%${key2}%') limit #{page},#{limit};")
    List<Map<String, Object>> getPageList(Long meetingId, int page, int limit, String key1, String key2);
    @Select("select p.id,p.title,a.id a_id,m.truename,m.phone,m.email,p.paperurl,p.create_time from attenders a join paper p on a.id=p.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del =0 and p.is_del = 0 and (p.title like '%${key1}%' or m.truename LIKE '%${key2}%') limit #{startLimt},#{endLimt};")
    List<Map<String, Object>> getPageList(Long meetingId, int startLimt, int endLimt, String key1, String key2);
    @Select("select count(p.id) from attenders a join paper p on a.id=p.attenders_id join member m on m.id=a.member_id where a.meeting_id=#{meetingId} and a.is_del =0 and p.is_del = 0 and (p.title like '%${key1}%' or m.truename LIKE '%${key2}%');")
    int getCounts(Long meetingId, String key1, String key2);

src/main/java/io/renren/modules/admin/dao/PaymentDao.java

@@ -19,11 +19,11 @@ import java.util.Map;
 */
@Mapper
public interface PaymentDao extends BaseMapper<PaymentEntity> {
    @Select("select p.id, p.order_id orderId, mem.truename, mem.organization, p.pay_type payType, mem.phone, mem.email, p.pay_time payTime,p.is_pay isPay from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%') limit #{page},#{limit};")
    List<Map<String, Object>> myQueryPage(Long meetingId, String name, String order, int page, int limit);
    @Select("select p.id, p.order_id orderId, mem.truename, mem.organization, p.pay_type payType, mem.phone, mem.email, p.pay_time payTime,p.is_pay isPay from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%') limit #{startLimt},#{endLimt};")
    List<Map<String, Object>> getPageList(Long meetingId, String name, String order, int startLimt, int endLimt);
    @Select("select count(*) from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%');")
    int myQueryPageCounts(Long meetingId, String name, String order);
    int getCounts(Long meetingId, String name, String order);
    @Select("select p.id, p.order_id orderId, mem.truename, mem.organization, p.pay_type payType, mem.phone, mem.email, p.pay_time payTime,p.is_pay isPay from attenders join payment p on attenders.id=p.attenders_id join member mem on mem.id=attenders.member_id where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 and (mem.truename like '%${name}%' or p.order_id like '%${order}%');")
    List<Map<String, Object>> getMapList(Long meetingId, String name, String order);

src/main/java/io/renren/modules/admin/service/MeetingService.java

@@ -20,7 +20,7 @@ public interface MeetingService extends IService<MeetingEntity> {
	/**
	 * 	带单位分页
	 */
	PageUtils queryList(int page, int limit, String key);
	PageUtils myQueryPage(Map<String, Object> params);
	/**
	 * 更新审核状态

src/main/java/io/renren/modules/admin/service/impl/AttendersServiceImpl.java

@@ -43,11 +43,12 @@ public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEnt
            page = 0;
        }
        int limit = params.containsKey("limit") ? Integer.valueOf((String) params.get("limit")) : 10;
        List<Map<String, Object>> list = baseMapper.getMapList(meetingId, key, key, page, limit);
        int startLimt = page * limit;
        int endLimt = startLimt + limit;
        List<Map<String, Object>> list = baseMapper.getPageList(meetingId, key, key, startLimt, endLimt);
        int total = baseMapper.getCounts(meetingId, key, key);
        return new PageUtils(list, total, limit, page);
        return new PageUtils(list, total, limit, page+1);
    }
    @Override

src/main/java/io/renren/modules/admin/service/impl/EmployeeServiceImpl.java

@@ -1,10 +1,6 @@
package io.renren.modules.admin.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import javafx.scene.control.Pagination;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
@@ -25,8 +21,6 @@ import io.renren.modules.admin.service.EmployeeService;
@Service("employeeService")
public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity> implements EmployeeService {
    @Autowired
    private EmployeeService employeeService;
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        String key = (String) params.get("key");
@@ -73,11 +67,6 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeDao, EmployeeEntity
        return new PageUtils(mList,total,limit,page);
    }
//    @Override
//    public IPage<EmployeeEntity> selectMyPage(Page page, Wrapper<EmployeeEntity> queryWrapper) {
//        return baseMapper.selectMyPage(page,queryWrapper);
//    }
    @Override
    public List<Map<String, Object>> selectNameList(String truename) {
        return baseMapper.selectNameList(truename);

src/main/java/io/renren/modules/admin/service/impl/LectureServiceImpl.java

@@ -33,14 +33,18 @@ public class LectureServiceImpl extends ServiceImpl<LectureDao, LectureEntity> i
    public PageUtils myQueryPage(Map<String, Object> params) {
        Long meetingId = Long.valueOf((String) params.get("meetingId"));
        String key = params.containsKey("page") ? (String) params.get("key") : "";
        int page = params.containsKey("page") ? Integer.valueOf(params.get("page").toString()) : 0;
        int page = params.containsKey("page") ? Integer.valueOf(params.get("page").toString()) - 1: 0;
        int limit =  params.containsKey("limit") ? Integer.valueOf(params.get("limit").toString()) : 10;
        List<Map<String, Object>> lectureList=baseMapper.getPageList(meetingId, key, key, page, limit);
        if (page < 0) {
            page = 0;
        }
        int startLimt = page * limit;
        int endLimt = startLimt + limit;
        List<Map<String, Object>> lectureList=baseMapper.getPageList(meetingId, key, key, startLimt, endLimt);
        int mc = baseMapper.getCounts(meetingId, key, key);
    
        return new  PageUtils(lectureList, mc, limit, page);
        return new  PageUtils(lectureList, mc, limit, page+1);
    }
    @Override

src/main/java/io/renren/modules/admin/service/impl/MeetingServiceImpl.java

@@ -29,11 +29,19 @@ public class MeetingServiceImpl extends ServiceImpl<MeetingDao, MeetingEntity> i
    }
    @Override
    public PageUtils queryList(int page, int limit, String key) {
        List<Map<String, Object>> mList=baseMapper.queryCN(page, limit, key, key);
        Integer mc = baseMapper.queryCNCOUNTS(key, key);
        return new PageUtils(mList, mc, limit, page);
    public PageUtils myQueryPage(Map<String, Object> params) {
        String key = (String) params.get("key");
        int page = params.containsKey("page") ? Integer.valueOf((String) params.get("page")) - 1 : 0;
        int limit = params.containsKey("limit") ? Integer.valueOf((String) params.get("limit")) : 10;
        if (page < 0) {
            page = 0;
        }
        int startLimt = page * limit;
        int endLimt = startLimt + limit;        
        List<Map<String, Object>> mList=baseMapper.getPageList(startLimt, endLimt, key, key);
        Integer mc = baseMapper.getCounts(key, key);
        return new PageUtils(mList, mc, limit, page+1);
    }
    @Override

src/main/java/io/renren/modules/admin/service/impl/PaperServiceImpl.java

@@ -37,11 +37,15 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
        String key = params.containsKey("page") ? (String) params.get("key") : "";
        int page = params.containsKey("page") ? Integer.valueOf(params.get("page").toString()) : 0;
        int limit =  params.containsKey("limit") ? Integer.valueOf(params.get("limit").toString()) : 10;
        List<Map<String, Object>> pList=baseMapper.getPageList(meetingId, page, limit, key, key);
        if (page < 0) {
            page = 0;
        }
        int startLimt = page * limit;
        int endLimt = startLimt + limit;
        List<Map<String, Object>> pList=baseMapper.getPageList(meetingId, startLimt, endLimt, key, key);
        int mc = baseMapper.getCounts(meetingId, key, key);
    
        return new  PageUtils(pList, mc, limit, page);
        return new  PageUtils(pList, mc, limit, page+1);
    }
}

src/main/java/io/renren/modules/admin/service/impl/PaymentServiceImpl.java

@@ -37,14 +37,16 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentDao, PaymentEntity> i
        String key = (String) params.get("key");
        int page = params.containsKey("page") ? Integer.valueOf((String) params.get("page")) - 1 : 0;
        int limit = params.containsKey("limit") ? Integer.valueOf((String) params.get("limit")) : 10;
        if (page < 0) {
            page = 0;
        }
        int limit = params.containsKey("limit") ? Integer.valueOf((String) params.get("limit")) : 10;
        List<Map<String, Object>> list = baseMapper.myQueryPage(meetingId, key, key, page, limit); 
        int total = baseMapper.myQueryPageCounts(meetingId, key, key);
        int startLimt = page * limit;
        int endLimt = startLimt + limit;
        List<Map<String, Object>> list = baseMapper.getPageList(meetingId, key, key, startLimt, endLimt); 
        int total = baseMapper.getCounts(meetingId, key, key);
        return new PageUtils(list, total, limit, page);
        return new PageUtils(list, total, limit, page+1);
    }
    @Override