lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改分页请求参数和响应

Browse Source
This commit is contained in:
lcj
2025-03-17 18:12:16 +08:00
parent 6eed3b2434
commit abed0527cd
45 changed files with 209 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/common/PageRequest.java
View File

@ -1,31 +0,0 @@
package org.dromara.common.core.common;
import lombok.Data;
import org.dromara.common.core.constant.CommonConstant;
/**
* 分页请求
*/
@Data
public class PageRequest {
/**
* 当前页号
*/
private int current = 1;
/**
* 页面大小
*/
private int pageSize = 10;
/**
* 排序字段
*/
private String sortField;
/**
* 排序顺序（默认升序）
*/
private String sortOrder = CommonConstant.SORT_ORDER_ASC;
}

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java
View File

@ -1,7 +1,6 @@
package org.dromara.machinery.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
@ -43,8 +44,8 @@ public class BusMachineryController extends BaseController {
*/
@SaCheckPermission("machinery:machinery:list")
@GetMapping("/list")
public R<Page<BusMachineryVo>> list(MachineryQueryReq req) {
return R.ok(busMachineryService.queryPageList(req));
public TableDataInfo<BusMachineryVo> list(MachineryQueryReq req, PageQuery pageQuery) {
return busMachineryService.queryPageList(req, pageQuery);
}
/**

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java
View File

@ -1,7 +1,6 @@
package org.dromara.machinery.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
@ -43,8 +44,8 @@ public class BusMachineryDetailController extends BaseController {
*/
@SaCheckPermission("machinery:machineryDetail:list")
@GetMapping("/list")
public R<Page<BusMachineryDetailVo>> list(MachineryDetailQueryReq req) {
return R.ok(busMachineryDetailService.queryPageList(req));
public TableDataInfo<BusMachineryDetailVo> list(MachineryDetailQueryReq req, PageQuery pageQuery) {
return busMachineryDetailService.queryPageList(req, pageQuery);
}
/**

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinery/MachineryQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.machinery.domain.req.machinery;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -11,9 +9,8 @@ import java.io.Serializable;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class MachineryQueryReq extends PageRequest implements Serializable {
public class MachineryQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 3252651952758479341L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/domain/req/machinerydetail/MachineryDetailQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.machinery.domain.req.machinerydetail;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -12,9 +10,8 @@ import java.util.Date;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class MachineryDetailQueryReq extends PageRequest implements Serializable {
public class MachineryDetailQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 3252651952758479341L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryDetailService.java
View File

@ -3,6 +3,8 @@ package org.dromara.machinery.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.machinery.domain.BusMachineryDetail;
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailCreateReq;
import org.dromara.machinery.domain.req.machinerydetail.MachineryDetailQueryReq;
@ -32,9 +34,10 @@ public interface IBusMachineryDetailService extends IService<BusMachineryDetail>
* 分页查询机械详情列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 机械详情分页列表
*/
Page<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req);
TableDataInfo<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的机械详情列表

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/IBusMachineryService.java
View File

@ -3,6 +3,8 @@ package org.dromara.machinery.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.machinery.domain.BusMachinery;
import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
@ -32,9 +34,10 @@ public interface IBusMachineryService extends IService<BusMachinery> {
* 分页查询机械列表
*
* @param req 查询条件
* @param pageQuery 分页条件
* @return 机械分页列表
*/
Page<BusMachineryVo> queryPageList(MachineryQueryReq req);
TableDataInfo<BusMachineryVo> queryPageList(MachineryQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的机械列表

21
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryDetailServiceImpl.java
View File

@ -1,17 +1,16 @@
package org.dromara.machinery.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.machinery.domain.BusMachinery;
import org.dromara.machinery.domain.BusMachineryDetail;
@ -72,15 +71,14 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
* 分页查询机械详情列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 机械详情分页列表
*/
@Override
public Page<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusMachineryDetailVo> queryPageList(MachineryDetailQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusMachineryDetail> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getVoPage(result);
Page<BusMachineryDetail> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -231,9 +229,6 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
Date entryTime = req.getEntryTime();
String remark = req.getRemark();
Long machineryId = req.getMachineryId();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 模糊查询
queryWrapper.like(StringUtils.isNotBlank(checkoutNumber), "checkout_number", checkoutNumber);
queryWrapper.like(StringUtils.isNotBlank(checkoutUnit), "checkout_unit", checkoutUnit);
@ -245,10 +240,6 @@ public class BusMachineryDetailServiceImpl extends ServiceImpl<BusMachineryDetai
queryWrapper.eq(ObjectUtils.isNotEmpty(type), "type", type);
queryWrapper.eq(ObjectUtils.isNotEmpty(entryTime), "entryTime", entryTime);
queryWrapper.eq(ObjectUtils.isNotEmpty(machineryId), "machinery_id", machineryId);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

20
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java
View File

@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.machinery.domain.BusMachinery;
import org.dromara.machinery.domain.BusMachineryDetail;
@ -67,15 +67,14 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
* 分页查询机械列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 机械分页列表
*/
@Override
public Page<BusMachineryVo> queryPageList(MachineryQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusMachineryVo> queryPageList(MachineryQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusMachinery> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getVoPage(result);
Page<BusMachinery> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -223,9 +222,6 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
Long number = req.getNumber();
String principal = req.getPrincipal();
String remark = req.getRemark();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 模糊查询
queryWrapper.like(StringUtils.isNotBlank(machineryName), "machinery_name", machineryName);
queryWrapper.like(StringUtils.isNotBlank(principal), "principal", principal);
@ -235,10 +231,6 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
queryWrapper.eq(ObjectUtils.isNotEmpty(number), "number", number);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java
View File

@ -1,7 +1,6 @@
package org.dromara.materials.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -15,6 +14,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.materials.domain.req.company.CompanyCreateReq;
import org.dromara.materials.domain.req.company.CompanyQueryReq;
@ -45,8 +46,8 @@ public class BusCompanyController extends BaseController {
*/
@SaCheckPermission("materials:company:list")
@GetMapping("/list")
public R<Page<BusCompanyVo>> list(CompanyQueryReq req) {
return R.ok(busCompanyService.queryPageList(req));
public TableDataInfo<BusCompanyVo> list(CompanyQueryReq req, PageQuery pageQuery) {
return busCompanyService.queryPageList(req, pageQuery);
}
/**

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java
View File

@ -1,7 +1,6 @@
package org.dromara.materials.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.materials.domain.req.materials.MaterialsCreateReq;
import org.dromara.materials.domain.req.materials.MaterialsQueryReq;
@ -43,8 +44,8 @@ public class BusMaterialsController extends BaseController {
*/
@SaCheckPermission("materials:materials:list")
@GetMapping("/list")
public R<Page<BusMaterialsVo>> list(MaterialsQueryReq req) {
return R.ok(busMaterialsService.queryPageList(req));
public TableDataInfo<BusMaterialsVo> list(MaterialsQueryReq req, PageQuery pageQuery) {
return busMaterialsService.queryPageList(req, pageQuery);
}
/**

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java
View File

@ -1,7 +1,6 @@
package org.dromara.materials.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryCreateReq;
import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryQueryReq;
@ -43,8 +44,8 @@ public class BusMaterialsInventoryController extends BaseController {
*/
@SaCheckPermission("materials:materialsInventory:list")
@GetMapping("/list")
public R<Page<BusMaterialsInventoryVo>> list(MaterialsInventoryQueryReq req) {
return R.ok(busMaterialsInventoryService.queryPageList(req));
public TableDataInfo<BusMaterialsInventoryVo> list(MaterialsInventoryQueryReq req, PageQuery pageQuery) {
return busMaterialsInventoryService.queryPageList(req, pageQuery);
}
/**

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/company/CompanyQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.materials.domain.req.company;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -11,9 +9,8 @@ import java.io.Serializable;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class CompanyQueryReq extends PageRequest implements Serializable {
public class CompanyQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 5563677643070664671L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materials/MaterialsQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.materials.domain.req.materials;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -12,9 +10,8 @@ import java.util.Map;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class MaterialsQueryReq extends PageRequest implements Serializable {
public class MaterialsQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 5563677643070664671L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/domain/req/materialsinventory/MaterialsInventoryQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.materials.domain.req.materialsinventory;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -12,9 +10,8 @@ import java.util.Date;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class MaterialsInventoryQueryReq extends PageRequest implements Serializable {
public class MaterialsInventoryQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 5563677643070664671L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusCompanyService.java
View File

@ -3,6 +3,8 @@ package org.dromara.materials.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.materials.domain.BusCompany;
import org.dromara.materials.domain.req.company.CompanyCreateReq;
import org.dromara.materials.domain.req.company.CompanyQueryReq;
@ -32,9 +34,10 @@ public interface IBusCompanyService extends IService<BusCompany> {
* 分页查询公司列表
*
* @param req 查询条件
* @param pageQuery 分页条件
* @return 公司分页列表
*/
Page<BusCompanyVo> queryPageList(CompanyQueryReq req);
TableDataInfo<BusCompanyVo> queryPageList(CompanyQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的公司列表

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsInventoryService.java
View File

@ -3,6 +3,8 @@ package org.dromara.materials.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.materials.domain.BusMaterialsInventory;
import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryCreateReq;
import org.dromara.materials.domain.req.materialsinventory.MaterialsInventoryQueryReq;
@ -32,9 +34,10 @@ public interface IBusMaterialsInventoryService extends IService<BusMaterialsInve
* 分页查询材料出/入库列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 材料出/入库分页列表
*/
Page<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req);
TableDataInfo<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的材料出/入库列表

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/IBusMaterialsService.java
View File

@ -3,6 +3,8 @@ package org.dromara.materials.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.materials.domain.BusMaterials;
import org.dromara.materials.domain.req.materials.MaterialsCreateReq;
import org.dromara.materials.domain.req.materials.MaterialsQueryReq;
@ -32,9 +34,10 @@ public interface IBusMaterialsService extends IService<BusMaterials> {
* 分页查询材料名称列表
*
* @param req 查询条件
* @param pageQuery 分页条件
* @return 材料名称分页列表
*/
Page<BusMaterialsVo> queryPageList(MaterialsQueryReq req);
TableDataInfo<BusMaterialsVo> queryPageList(MaterialsQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的材料名称列表

21
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusCompanyServiceImpl.java
View File

@ -1,18 +1,17 @@
package org.dromara.materials.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.materials.domain.BusCompany;
import org.dromara.materials.domain.BusMaterials;
@ -65,15 +64,14 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
* 分页查询公司列表
*
* @param req 查询条件
* @param pageQuery 分页信息
* @return 公司分页列表
*/
@Override
public Page<BusCompanyVo> queryPageList(CompanyQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusCompanyVo> queryPageList(CompanyQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusCompany> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getCompanyVoPage(result);
Page<BusCompany> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getCompanyVoPage(result));
}
/**
@ -208,9 +206,6 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
String status = req.getStatus();
String remark = req.getRemark();
String qualification = req.getQualification();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 模糊查询
queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
queryWrapper.like(StringUtils.isNotBlank(qualification), "qualification", qualification);
@ -219,10 +214,6 @@ public class BusCompanyServiceImpl extends ServiceImpl<BusCompanyMapper, BusComp
queryWrapper.eq(ObjectUtils.isNotEmpty(status), "status", status);
queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

20
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsInventoryServiceImpl.java
View File

@ -1,17 +1,16 @@
package org.dromara.materials.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.materials.domain.BusMaterials;
import org.dromara.materials.domain.BusMaterialsInventory;
@ -71,12 +70,10 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
* @return 材料出/入库分页列表
*/
@Override
public Page<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusMaterialsInventoryVo> queryPageList(MaterialsInventoryQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusMaterialsInventory> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getVoPage(result);
Page<BusMaterialsInventory> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -233,9 +230,6 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
String recipient = req.getRecipient();
String shipper = req.getShipper();
String remark = req.getRemark();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 联表查询
if (StringUtils.isNotBlank(materialsName)) {
QueryWrapper<BusMaterials> materialsQueryWrapper = new QueryWrapper<>();
@ -258,10 +252,6 @@ public class BusMaterialsInventoryServiceImpl extends ServiceImpl<BusMaterialsIn
queryWrapper.eq(ObjectUtils.isNotEmpty(outPutTime), "out_put_time", outPutTime);
queryWrapper.eq(ObjectUtils.isNotEmpty(residue), "residue", residue);
queryWrapper.eq(ObjectUtils.isNotEmpty(outPut), "out_put", outPut);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

21
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/BusMaterialsServiceImpl.java
View File

@ -1,7 +1,6 @@
package org.dromara.materials.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -9,13 +8,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.materials.domain.BusMaterials;
import org.dromara.materials.domain.BusMaterialsInventory;
@ -80,15 +79,14 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
* 分页查询材料名称列表
*
* @param req 查询条件
* @param pageQuery 分页条件
* @return 材料名称分页列表
*/
@Override
public Page<BusMaterialsVo> queryPageList(MaterialsQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusMaterialsVo> queryPageList(MaterialsQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusMaterials> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getMaterialsVoPage(result);
Page<BusMaterials> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getMaterialsVoPage(result));
}
/**
@ -264,9 +262,6 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
String remark = req.getRemark();
String quantityCount = req.getQuantityCount();
String status = req.getStatus();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 模糊查询
queryWrapper.like(StringUtils.isNotBlank(materialsName), "materials_name", materialsName);
queryWrapper.like(StringUtils.isNotBlank(typeSpecificationName), "type_specification_name", typeSpecificationName);
@ -279,10 +274,6 @@ public class BusMaterialsServiceImpl extends ServiceImpl<BusMaterialsMapper, Bus
queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
queryWrapper.eq(ObjectUtils.isNotEmpty(companyId), "company_id", companyId);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java
View File

@ -1,7 +1,6 @@
package org.dromara.project.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.project.domain.req.constructionuser.ConstructionUserCreateReq;
import org.dromara.project.domain.req.constructionuser.ConstructionUserQueryReq;
@ -43,8 +44,8 @@ public class BusConstructionUserController extends BaseController {
*/
@SaCheckPermission("project:constructionUser:list")
@GetMapping("/list")
public R<Page<BusConstructionUserVo>> list(ConstructionUserQueryReq req) {
return R.ok(busConstructionUserService.queryPageList(req));
public TableDataInfo<BusConstructionUserVo> list(ConstructionUserQueryReq req, PageQuery pageQuery) {
return busConstructionUserService.queryPageList(req, pageQuery);
}
/**

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java
View File

@ -1,7 +1,6 @@
package org.dromara.project.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.project.domain.req.contractor.ContractorCreateReq;
import org.dromara.project.domain.req.contractor.ContractorQueryReq;
@ -43,8 +44,8 @@ public class BusContractorController extends BaseController {
*/
@SaCheckPermission("project:contractor:list")
@GetMapping("/list")
public R<Page<BusContractorVo>> list(ContractorQueryReq req) {
return R.ok(busContractorService.queryPageList(req));
public TableDataInfo<BusContractorVo> list(ContractorQueryReq req, PageQuery pageQuery) {
return busContractorService.queryPageList(req, pageQuery);
}
/**

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
View File

@ -1,7 +1,6 @@
package org.dromara.project.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -15,6 +14,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.project.domain.req.project.ProjectCreateReq;
import org.dromara.project.domain.req.project.ProjectQueryReq;
@ -45,8 +46,8 @@ public class BusProjectController extends BaseController {
*/
@SaCheckPermission("project:project:list")
@GetMapping("/list")
public R<Page<BusProjectVo>> list(ProjectQueryReq req) {
return R.ok(projectService.queryPageList(req));
public TableDataInfo<BusProjectVo> list(ProjectQueryReq req, PageQuery pageQuery) {
return projectService.queryPageList(req, pageQuery);
}
/**

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
View File

@ -1,7 +1,6 @@
package org.dromara.project.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
import org.dromara.project.domain.req.projectteam.ProjectTeamQueryReq;
@ -43,8 +44,8 @@ public class BusProjectTeamController extends BaseController {
*/
@SaCheckPermission("project:projectTeam:list")
@GetMapping("/list")
public R<Page<BusProjectTeamVo>> list(ProjectTeamQueryReq req) {
return R.ok(busProjectTeamService.queryPageList(req));
public TableDataInfo<BusProjectTeamVo> list(ProjectTeamQueryReq req, PageQuery pageQuery) {
return busProjectTeamService.queryPageList(req, pageQuery);
}
/**

7
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java
View File

@ -1,7 +1,6 @@
package org.dromara.project.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -13,6 +12,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberCreateReq;
import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberQueryReq;
@ -43,8 +44,8 @@ public class BusProjectTeamMemberController extends BaseController {
*/
@SaCheckPermission("project:projectTeamMember:list")
@GetMapping("/list")
public R<Page<BusProjectTeamMemberVo>> list(ProjectTeamMemberQueryReq req) {
return R.ok(busProjectTeamMemberService.queryPageList(req));
public TableDataInfo<BusProjectTeamMemberVo> list(ProjectTeamMemberQueryReq req, PageQuery pageQuery) {
return busProjectTeamMemberService.queryPageList(req, pageQuery);
}
/**

12
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
View File

@ -2,8 +2,6 @@ package org.dromara.project.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
@ -15,6 +13,8 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
import org.dromara.project.domain.BusUserProjectRelevancy;
@ -49,8 +49,8 @@ public class BusUserProjectRelevancyController extends BaseController {
*/
@SaCheckPermission("project:projectRelevancy:list")
@GetMapping("/list")
public R<Page<BusUserProjectRelevancyVo>> list(UserProjectRelevancyQueryReq req) {
return R.ok(userProjectRelevancyService.queryPageList(req));
public TableDataInfo<BusUserProjectRelevancyVo> list(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
return userProjectRelevancyService.queryPageList(req, pageQuery);
}
/**
@ -68,9 +68,9 @@ public class BusUserProjectRelevancyController extends BaseController {
*/
@SaCheckPermission("project:projectRelevancy:list")
@GetMapping("/login/page")
public R<Page<BusUserProjectRelevancyVo>> pageByLoginUser(UserProjectRelevancyQueryReq req) {
public TableDataInfo<BusUserProjectRelevancyVo> pageByLoginUser(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
Long userId = LoginHelper.getUserId();
return R.ok(userProjectRelevancyService.queryPageByUserId(userId, req));
return userProjectRelevancyService.queryPageByUserId(userId, req, pageQuery);
}
/**

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/constructionuser/ConstructionUserQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.project.domain.req.constructionuser;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -11,9 +9,8 @@ import java.io.Serializable;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ConstructionUserQueryReq extends PageRequest implements Serializable {
public class ConstructionUserQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 3252651952758479341L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/contractor/ContractorQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.project.domain.req.contractor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -11,9 +9,8 @@ import java.io.Serializable;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ContractorQueryReq extends PageRequest implements Serializable {
public class ContractorQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 3252651952758479341L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/project/ProjectQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.project.domain.req.project;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -11,9 +9,8 @@ import java.io.Serializable;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ProjectQueryReq extends PageRequest implements Serializable {
public class ProjectQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 5563677643070664671L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteam/ProjectTeamQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.project.domain.req.projectteam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -11,9 +9,8 @@ import java.io.Serializable;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ProjectTeamQueryReq extends PageRequest implements Serializable {
public class ProjectTeamQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 3252651952758479341L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/projectteammember/ProjectTeamMemberQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.project.domain.req.projectteammember;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -11,9 +9,8 @@ import java.io.Serializable;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ProjectTeamMemberQueryReq extends PageRequest implements Serializable {
public class ProjectTeamMemberQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 3252651952758479341L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/req/userprojectrelevancy/UserProjectRelevancyQueryReq.java
View File

@ -1,8 +1,6 @@
package org.dromara.project.domain.req.userprojectrelevancy;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.core.common.PageRequest;
import java.io.Serial;
import java.io.Serializable;
@ -11,9 +9,8 @@ import java.io.Serializable;
* @author lcj
* @date 2025/3/5 14:31
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class UserProjectRelevancyQueryReq extends PageRequest implements Serializable {
public class UserProjectRelevancyQueryReq implements Serializable {
@Serial
private static final long serialVersionUID = 3252651952758479341L;

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusConstructionUserService.java
View File

@ -3,6 +3,8 @@ package org.dromara.project.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.project.domain.BusConstructionUser;
import org.dromara.project.domain.req.constructionuser.ConstructionUserCreateReq;
import org.dromara.project.domain.req.constructionuser.ConstructionUserQueryReq;
@ -32,9 +34,10 @@ public interface IBusConstructionUserService extends IService<BusConstructionUse
* 分页查询施工人员列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 施工人员分页列表
*/
Page<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req);
TableDataInfo<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的施工人员列表

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusContractorService.java
View File

@ -3,6 +3,8 @@ package org.dromara.project.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.project.domain.BusContractor;
import org.dromara.project.domain.req.contractor.ContractorCreateReq;
import org.dromara.project.domain.req.contractor.ContractorQueryReq;
@ -32,9 +34,10 @@ public interface IBusContractorService extends IService<BusContractor> {
* 分页查询分包单位列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 分包单位分页列表
*/
Page<BusContractorVo> queryPageList(ContractorQueryReq req);
TableDataInfo<BusContractorVo> queryPageList(ContractorQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的分包单位列表

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java
View File

@ -3,6 +3,8 @@ package org.dromara.project.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.project.domain.BusProject;
import org.dromara.project.domain.req.project.ProjectCreateReq;
import org.dromara.project.domain.req.project.ProjectQueryReq;
@ -32,9 +34,10 @@ public interface IBusProjectService extends IService<BusProject> {
* 分页查询项目列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 项目分页列表
*/
Page<BusProjectVo> queryPageList(ProjectQueryReq req);
TableDataInfo<BusProjectVo> queryPageList(ProjectQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的项目列表

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamMemberService.java
View File

@ -3,6 +3,8 @@ package org.dromara.project.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.project.domain.BusProjectTeamMember;
import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberCreateReq;
import org.dromara.project.domain.req.projectteammember.ProjectTeamMemberQueryReq;
@ -32,9 +34,10 @@ public interface IBusProjectTeamMemberService extends IService<BusProjectTeamMem
* 分页查询项目班组下的成员列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 项目班组下的成员分页列表
*/
Page<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req);
TableDataInfo<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的项目班组下的成员列表

5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectTeamService.java
View File

@ -3,6 +3,8 @@ package org.dromara.project.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.project.domain.BusProjectTeam;
import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
import org.dromara.project.domain.req.projectteam.ProjectTeamQueryReq;
@ -32,9 +34,10 @@ public interface IBusProjectTeamService extends IService<BusProjectTeam> {
* 分页查询项目班组列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 项目班组分页列表
*/
Page<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req);
TableDataInfo<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的项目班组列表

8
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusUserProjectRelevancyService.java
View File

@ -3,6 +3,8 @@ package org.dromara.project.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.project.domain.BusUserProjectRelevancy;
import org.dromara.project.domain.req.project.ProjectBatchByProjectListReq;
import org.dromara.project.domain.req.userprojectrelevancy.UserProjectRelevancyCreateReq;
@ -34,9 +36,10 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
* 分页查询系统用户与项目关联列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 系统用户与项目关联分页列表
*/
Page<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req);
TableDataInfo<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery);
/**
* 查询符合条件的系统用户与项目关联列表
@ -84,9 +87,10 @@ public interface IBusUserProjectRelevancyService extends IService<BusUserProject
*
* @param userId 登录用户ID
* @param req 分页查询条件
* @param pageQuery 分页参数
* @return 当前登录用户项目分页
*/
Page<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req);
TableDataInfo<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req, PageQuery pageQuery);
/**
* 批量新增用户和项目关联

21
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusConstructionUserServiceImpl.java
View File

@ -1,17 +1,16 @@
package org.dromara.project.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.project.domain.BusConstructionUser;
import org.dromara.project.domain.BusContractor;
@ -81,15 +80,14 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
* 分页查询施工人员列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 施工人员分页列表
*/
@Override
public Page<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusConstructionUserVo> queryPageList(ConstructionUserQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusConstructionUser> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getVoPage(result);
Page<BusConstructionUser> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(getVoPage(result));
}
/**
@ -274,9 +272,6 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
String clock = req.getClock();
Long salary = req.getSalary();
String remark = req.getRemark();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 模糊查询
queryWrapper.like(StringUtils.isNotBlank(nickName), "nick_name", nickName);
queryWrapper.like(StringUtils.isNotBlank(userName), "user_name", userName);
@ -310,10 +305,6 @@ public class BusConstructionUserServiceImpl extends ServiceImpl<BusConstructionU
.ne("team_id", notTeamId)
.or().isNull("team_id"));
}
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

21
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusContractorServiceImpl.java
View File

@ -1,19 +1,18 @@
package org.dromara.project.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.project.domain.BusConstructionUser;
import org.dromara.project.domain.BusContractor;
@ -65,15 +64,14 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
* 分页查询分包单位列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 分包单位分页列表
*/
@Override
public Page<BusContractorVo> queryPageList(ContractorQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusContractorVo> queryPageList(ContractorQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusContractor> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getVoPage(result);
Page<BusContractor> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -237,9 +235,6 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
String custodian = req.getCustodian();
String custodianPhone = req.getCustodianPhone();
String remark = req.getRemark();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 模糊查询
queryWrapper.like(StringUtils.isNotBlank(name), "name", name);
queryWrapper.like(StringUtils.isNotBlank(principal), "principal", principal);
@ -249,10 +244,6 @@ public class BusContractorServiceImpl extends ServiceImpl<BusContractorMapper, B
queryWrapper.like(StringUtils.isNotBlank(remark), "remark", remark);
// 精确查询
queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

31
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
View File

@ -1,18 +1,18 @@
package org.dromara.project.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.project.domain.BusProject;
import org.dromara.project.domain.BusUserProjectRelevancy;
@ -65,15 +65,14 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
* 分页查询项目列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 项目分页列表
*/
@Override
public Page<BusProjectVo> queryPageList(ProjectQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusProjectVo> queryPageList(ProjectQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusProject> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getVoPage(result);
Page<BusProject> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -95,6 +94,7 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
* @return 新项目 id
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Long insertByBo(ProjectCreateReq dto) {
// 将实体类和 DTO 进行转换
BusProject project = new BusProject();
@ -109,10 +109,14 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
Long projectId = project.getId();
Long userId = LoginHelper.getUserId();
// 同步保存用户与项目关联
List<Long> userIdList = List.of(userId, SystemConstants.SUPER_ADMIN_ID);
List<BusUserProjectRelevancy> userProjectRelevancyList = userIdList.stream().map(id -> {
BusUserProjectRelevancy userProjectRelevancy = new BusUserProjectRelevancy();
userProjectRelevancy.setUserId(userId);
userProjectRelevancy.setUserId(id);
userProjectRelevancy.setProjectId(projectId);
boolean saveRelevancy = userProjectRelevancyService.save(userProjectRelevancy);
return userProjectRelevancy;
}).toList();
boolean saveRelevancy = userProjectRelevancyService.saveBatch(userProjectRelevancyList);
if (!saveRelevancy) {
throw new ServiceException("新增用户与项目关联失败，数据库异常", HttpStatus.ERROR);
}
@ -249,9 +253,6 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
String punchRange = req.getPunchRange();
Long designTotal = req.getDesignTotal();
String showHidden = req.getShowHidden();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 模糊查询
queryWrapper.like(StringUtils.isNotBlank(projectName), "project_name", projectName);
queryWrapper.like(StringUtils.isNotBlank(shortName), "short_name", shortName);
@ -271,10 +272,6 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
queryWrapper.eq(ObjectUtils.isNotEmpty(isType), "is_type", isType);
queryWrapper.eq(ObjectUtils.isNotEmpty(designTotal), "design_total", designTotal);
queryWrapper.eq(ObjectUtils.isNotEmpty(showHidden), "show_hidden", showHidden);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

21
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamMemberServiceImpl.java
View File

@ -1,19 +1,18 @@
package org.dromara.project.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.project.domain.BusConstructionUser;
import org.dromara.project.domain.BusProjectTeamMember;
@ -74,15 +73,14 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
* 分页查询项目班组下的成员列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 项目班组下的成员分页列表
*/
@Override
public Page<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusProjectTeamMemberVo> queryPageList(ProjectTeamMemberQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusProjectTeamMember> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getVoPage(result);
Page<BusProjectTeamMember> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -262,9 +260,6 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
String memberName = req.getMemberName();
String postId = req.getPostId();
String remark = req.getRemark();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 联表查询
if (StringUtils.isNotBlank(memberName)) {
QueryWrapper<BusConstructionUser> constructionUserQueryWrapper = new QueryWrapper<>();
@ -281,10 +276,6 @@ public class BusProjectTeamMemberServiceImpl extends ServiceImpl<BusProjectTeamM
queryWrapper.eq(ObjectUtils.isNotEmpty(teamId), "team_id", teamId);
queryWrapper.eq(ObjectUtils.isNotEmpty(memberId), "member_id", memberId);
queryWrapper.eq(ObjectUtils.isNotEmpty(postId), "post_id", postId);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

21
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
View File

@ -1,18 +1,17 @@
package org.dromara.project.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.project.domain.BusProjectTeam;
import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
@ -61,15 +60,14 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
* 分页查询项目班组列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 项目班组分页列表
*/
@Override
public Page<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusProjectTeamVo> queryPageList(ProjectTeamQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusProjectTeam> result = this.page(new Page<>(current, size), this.getQueryWrapper(req));
return this.getVoPage(result);
Page<BusProjectTeam> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -217,9 +215,6 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
String teamName = req.getTeamName();
String isClockIn = req.getIsClockIn();
String remark = req.getRemark();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 模糊查询
queryWrapper.like(StringUtils.isNotBlank(teamName), "team_name", teamName);
queryWrapper.like(StringUtils.isNotBlank(remark), "remark", remark);
@ -227,10 +222,6 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
queryWrapper.eq(ObjectUtils.isNotEmpty(isClockIn), "is_clock_in", isClockIn);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}

32
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusUserProjectRelevancyServiceImpl.java
View File

@ -1,18 +1,17 @@
package org.dromara.project.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.dromara.common.core.constant.CommonConstant;
import org.dromara.common.core.constant.HttpStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.ObjectUtils;
import org.dromara.common.core.utils.sql.SqlUtil;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.project.domain.BusProject;
import org.dromara.project.domain.BusUserProjectRelevancy;
@ -72,16 +71,14 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
* 分页查询系统用户与项目关联列表
*
* @param req 查询条件
* @param pageQuery 分页参数
* @return 系统用户与项目关联分页列表
*/
@Override
public Page<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
QueryWrapper<BusUserProjectRelevancy> queryWrapper = this.getQueryWrapper(req);
public TableDataInfo<BusUserProjectRelevancyVo> queryPageList(UserProjectRelevancyQueryReq req, PageQuery pageQuery) {
// 查询数据库
Page<BusUserProjectRelevancy> result = this.page(new Page<>(current, size), queryWrapper);
return this.getVoPage(result);
Page<BusUserProjectRelevancy> result = this.page(pageQuery.build(), this.getQueryWrapper(req));
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -236,18 +233,18 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
*
* @param userId 登录用户ID
* @param req 分页查询条件
* @param pageQuery 分页查询条件
* @return 当前登录用户项目分页
*/
@Override
public Page<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req) {
long current = req.getCurrent();
long size = req.getPageSize();
public TableDataInfo<BusUserProjectRelevancyVo> queryPageByUserId(Long userId, UserProjectRelevancyQueryReq req,
PageQuery pageQuery) {
// 添加查询条件
req.setUserId(userId);
QueryWrapper<BusUserProjectRelevancy> queryWrapper = this.getQueryWrapper(req);
// 查询数据库
Page<BusUserProjectRelevancy> result = this.page(new Page<>(current, size), queryWrapper);
return this.getVoPage(result);
Page<BusUserProjectRelevancy> result = this.page(pageQuery.build(), queryWrapper);
return TableDataInfo.build(this.getVoPage(result));
}
/**
@ -325,17 +322,10 @@ public class BusUserProjectRelevancyServiceImpl extends ServiceImpl<BusUserProje
Long id = req.getId();
Long userId = req.getUserId();
Long projectId = req.getProjectId();
String sortField = req.getSortField();
String sortOrder = req.getSortOrder();
String underlineSortField = StrUtil.toUnderlineCase(sortField);
// 精确查询
queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
queryWrapper.eq(ObjectUtils.isNotEmpty(userId), "user_id", userId);
queryWrapper.eq(ObjectUtils.isNotEmpty(projectId), "project_id", projectId);
// 排序规则
queryWrapper.orderBy(SqlUtil.validSortField(sortField),
sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
underlineSortField);
return queryWrapper;
}