cy
parent
e187813e0b
commit
faccb76a75
|
@ -3,7 +3,7 @@ package com.muyu.master.controller;
|
|||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.dtflys.forest.springboot.annotation.ForestScannerRegister;
|
||||
import com.muyu.common.core.domain.Result;
|
||||
import com.muyu.common.security.annotation.RequiresPermissions;
|
||||
|
||||
import com.muyu.market.domian.Defined;
|
||||
import com.muyu.market.domian.config.PageParam;
|
||||
import com.muyu.market.domian.req.DefinedReq;
|
||||
|
@ -17,9 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @Author:ChenYan
|
||||
* @Project:2112-cloud-market
|
||||
|
@ -65,7 +62,7 @@ public class DefinedController {
|
|||
/**模糊查询 有效期**/
|
||||
queryWrapper.like(
|
||||
StringUtils.isNotEmpty(String.valueOf(definedReq.getDefinedDateValidity())),
|
||||
Defined::getDefinedDateValidity,
|
||||
Defined::getDefinedDataValidity,
|
||||
definedReq.getDefinedDateValidity()
|
||||
);
|
||||
|
||||
|
|
|
@ -2,9 +2,7 @@ package com.muyu.master.service;
|
|||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.muyu.market.domian.Defined;
|
||||
import com.muyu.market.domian.req.DefinedReq;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author:ChenYan
|
||||
|
@ -16,7 +14,6 @@ import java.util.List;
|
|||
*/
|
||||
public interface DefinedService extends IService<Defined> {
|
||||
|
||||
List<Defined> selectList(DefinedReq definedReq);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -1,18 +1,17 @@
|
|||
package com.muyu.master.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.muyu.market.domian.Defined;
|
||||
import com.muyu.market.domian.req.DefinedReq;
|
||||
|
||||
import com.muyu.master.mapper.DefinedMapper;
|
||||
|
||||
import com.muyu.master.service.DefinedService;
|
||||
import io.micrometer.common.util.StringUtils;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author:ChenYan
|
||||
|
@ -32,25 +31,4 @@ public class DefinedServiceImpl
|
|||
|
||||
|
||||
|
||||
@Override
|
||||
public List<Defined> selectList(DefinedReq definedReq) {
|
||||
|
||||
/**模糊查询 名称**/
|
||||
LambdaQueryWrapper<Defined> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper.like(
|
||||
StringUtils.isNotEmpty(definedReq.getDefinedName()),
|
||||
Defined::getDefinedName,definedReq.getDefinedName()
|
||||
);
|
||||
|
||||
/**模糊查询 有效期**/
|
||||
queryWrapper.like(
|
||||
StringUtils.isNotEmpty(String.valueOf(definedReq.getDefinedDateValidity())),
|
||||
Defined::getDefinedDataValidity,
|
||||
definedReq.getDefinedDateValidity()
|
||||
);
|
||||
|
||||
List<Defined> list = this.list(queryWrapper);
|
||||
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue