用户端 查询服务列表增加城市筛选

pz-system/src/main/java/com/pz/system/domain/bo/ServicesBo.java

@@ -85,10 +85,4 @@ public class ServicesBo extends BaseEntity {
      */
     private String info;
 
-    /**
-     * 城市ID
-     */
-    private Integer cityId;
-
-
 }

pz-system/src/main/java/com/pz/system/service/impl/ServicesServiceImpl.java

@@ -40,7 +40,7 @@ public class ServicesServiceImpl implements IServicesService {
      * 查询服务
      */
     @Override
-    public ServicesVo queryById(Integer id){
+    public ServicesVo queryById(Integer id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -51,11 +51,9 @@ public class ServicesServiceImpl implements IServicesService {
     public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo);
         Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        Optional.ofNullable(result.getRecords()).ifPresent(records -> {
-        List<Notice> notices = noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite,2));
-        if(null != notices && notices.size() != 0){
-            records.get(0).setNotice(notices.get(0).getInfo());
-        }
+        result.getRecords().stream().findFirst().ifPresent(service -> {
+            noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2))
+                .stream().findFirst().ifPresent(notices -> service.setNotice(notices.getInfo()));
         });
         return TableDataInfo.build(result);
     }
@@ -75,7 +73,7 @@ public class ServicesServiceImpl implements IServicesService {
         lqw.eq(bo.getBid() != null, Services::getBid, bo.getBid());
         lqw.like(StringUtils.isNotBlank(bo.getName()), Services::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getCover()), Services::getCover, bo.getCover());
-
+        lqw.eq(bo.getCityId() != null, Services::getCityId, bo.getCityId());
         lqw.eq(bo.getFenmo() != null, Services::getFenmo, bo.getFenmo());
         lqw.eq(bo.getDuration() != null, Services::getDuration, bo.getDuration());
         lqw.eq(bo.getOvertime() != null, Services::getOvertime, bo.getOvertime());
@@ -112,8 +110,8 @@ public class ServicesServiceImpl implements IServicesService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(Services entity){
-        //TODO 做一些数据校验,如唯一约束
+    private void validEntityBeforeSave(Services entity) {
+        // TODO 做一些数据校验,如唯一约束
     }
 
     /**
@@ -121,8 +119,8 @@ public class ServicesServiceImpl implements IServicesService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }