ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
@@ -2,11 +2,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.domain.TFoundationConfig; import com.ruoyi.system.domain.TFoundationPerson; import com.ruoyi.system.domain.TShop; import com.ruoyi.system.dto.TFoundationPersonDTO; import com.ruoyi.system.query.TFoundationPersonQuery; import com.ruoyi.system.service.TFoundationConfigService; import com.ruoyi.system.service.TFoundationPersonService; import com.ruoyi.system.service.TShopService; @@ -47,8 +49,8 @@ */ @ApiOperation( value = "查询基础设置列表") @PostMapping(value = "/list") public AjaxResult<List<TFoundationPersonVO>> list() { return AjaxResult.success(foundationPersonService.getList()); public AjaxResult<PageInfo<TFoundationPersonVO>> list(@RequestBody TFoundationPersonQuery query) { return AjaxResult.success(foundationPersonService.getList(query)); } /** ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -70,7 +70,7 @@ public LoginUser login(String username, String password, String code, String uuid) { // 验证码校验 validateCaptcha(username, code, uuid); // validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username, password); // 用户验证 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TFoundationPersonMapper.java
@@ -1,8 +1,11 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.domain.TFoundationPerson; import com.ruoyi.system.query.TFoundationPersonQuery; import com.ruoyi.system.vo.TFoundationPersonVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +23,6 @@ * 查询基础设置列表 * @return */ List<TFoundationPersonVO> getList(); List<TFoundationPersonVO> getList(@Param("query") TFoundationPersonQuery query, @Param("pageInfo")PageInfo<TFoundationPersonVO> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/query/TFoundationPersonQuery.java
New file @@ -0,0 +1,15 @@ package com.ruoyi.system.query; import com.ruoyi.common.annotation.DataSource; import com.ruoyi.common.core.domain.BasePage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @Data public class TFoundationPersonQuery extends BasePage { @ApiModelProperty(value = "门店名称") private String shopName; } ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
@@ -1,8 +1,10 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.domain.TFoundationPerson; import com.ruoyi.system.dto.TFoundationPersonDTO; import com.ruoyi.system.query.TFoundationPersonQuery; import com.ruoyi.system.vo.TFoundationPersonVO; import java.util.List; @@ -34,6 +36,6 @@ * 查询基础设置列表 * @return */ List<TFoundationPersonVO> getList(); PageInfo<TFoundationPersonVO> getList(TFoundationPersonQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
@@ -2,13 +2,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.system.domain.TFoundationConfig; import com.ruoyi.system.domain.TFoundationPerson; import com.ruoyi.system.dto.TFoundationPersonDTO; import com.ruoyi.system.mapper.TFoundationPersonMapper; import com.ruoyi.system.query.TFoundationPersonQuery; import com.ruoyi.system.service.TFoundationConfigService; import com.ruoyi.system.service.TFoundationPersonService; import com.ruoyi.system.vo.SysUserVO; import com.ruoyi.system.vo.TFoundationPersonVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,8 +87,9 @@ } @Override public List<TFoundationPersonVO> getList() { List<TFoundationPersonVO> list = this.baseMapper.getList(); public PageInfo<TFoundationPersonVO> getList(TFoundationPersonQuery query) { PageInfo<TFoundationPersonVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TFoundationPersonVO> list = this.baseMapper.getList(query,pageInfo); List<Long> ids = list.stream().map(TFoundationPersonVO::getId).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(ids)){ List<TFoundationConfig> list1 = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class) @@ -99,6 +103,7 @@ } }); } return list; pageInfo.setRecords(list); return pageInfo; } } ruoyi-system/src/main/java/com/ruoyi/system/vo/TFoundationPersonVO.java
@@ -25,4 +25,7 @@ @ApiModelProperty(value = "店铺信息") private TShop shop; @ApiModelProperty(value = "店铺名称") private String shopName; } ruoyi-system/src/main/resources/mapper/system/TFoundationPersonMapper.xml
@@ -12,13 +12,19 @@ <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id, mealCount,createTime id, mealCount,createTime,shopId </sql> <select id="getList" resultType="com.ruoyi.system.vo.TFoundationPersonVO"> select <include refid="Base_Column_List"/> from t_foundation_person ORDER BY createTime DESC tfp.id, tfp.mealCount,tfp.createTime,tfp.shopId,ts.shopName from t_foundation_person tfp left join t_shop ts on ts.id = tfp.shopId <where> <if test="query.shopName != null and query.shopName != ''"> and ts.shopName like concat('%', #{query.shopName}, '%') </if> </where> ORDER BY tfp.createTime DESC </select> </mapper>
