九小场所撒点调整

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BaseGgpFacilityServiceImpl.java

@@ -29,16 +29,39 @@ import java.util.List;
 public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacilityMapper, BaseGgpFacility> implements BaseGgpFacilityService {
     @Override
     public List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO) {
-        List<BaseGgpFacilityListVO> list1 = new ArrayList<>();
-        LambdaQueryWrapper<BaseGgpFacility> query = Wrappers.lambdaQuery();
-        query.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown, baseGgpFacilityVO.getStreetTown());
-        query.in(CollectionUtils.isNotEmpty(baseGgpFacilityVO.getFacilityType()),BaseGgpFacility::getFacilityType,
-                baseGgpFacilityVO.getFacilityType());
-        if(baseGgpFacilityVO.getFacilityType().get(0)==39){
-            query.orderByDesc(BaseGgpFacility::getId);
-            query.last("limit 500");
+        List<BaseGgpFacility> list = new ArrayList<>();
+        if ((baseGgpFacilityVO.getFacilityType().size()==2 && baseGgpFacilityVO.getFacilityType().get(0)==39 && baseGgpFacilityVO.getFacilityType().get(0)==42) || (baseGgpFacilityVO.getFacilityType().size()==2 && baseGgpFacilityVO.getFacilityType().get(0)==42 && baseGgpFacilityVO.getFacilityType().get(0)==39)){
+            LambdaQueryWrapper<BaseGgpFacility> query1 = Wrappers.lambdaQuery();
+            query1.select(BaseGgpFacility::getId,BaseGgpFacility::getFacilityName,BaseGgpFacility::getAddress,
+                    BaseGgpFacility::getFacilityType,BaseGgpFacility::getLongitude,BaseGgpFacility::getLatitude,
+                    BaseGgpFacility::getStreetTown,BaseGgpFacility::getContact,BaseGgpFacility::getContactPhone,
+                    BaseGgpFacility::getCheckComment);
+            query1.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown,
+                    baseGgpFacilityVO.getStreetTown());
+            query1.eq(BaseGgpFacility::getFacilityType,39);
+            List<BaseGgpFacility> list1 = this.list(query1);
+            LambdaQueryWrapper<BaseGgpFacility> query2 = Wrappers.lambdaQuery();
+            query2.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown,
+                    baseGgpFacilityVO.getStreetTown());
+            query2.eq(BaseGgpFacility::getFacilityType,42);
+            List<BaseGgpFacility> list2 = this.list(query2);
+            list.addAll(list1);
+            list.addAll(list2);
+        }else {
+            LambdaQueryWrapper<BaseGgpFacility> query = Wrappers.lambdaQuery();
+            if (baseGgpFacilityVO.getFacilityType().size()==1){
+                if(baseGgpFacilityVO.getFacilityType().get(0)==39){
+                    query.select(BaseGgpFacility::getId,BaseGgpFacility::getFacilityName,BaseGgpFacility::getAddress,
+                            BaseGgpFacility::getFacilityType,BaseGgpFacility::getLongitude,BaseGgpFacility::getLatitude,
+                            BaseGgpFacility::getStreetTown,BaseGgpFacility::getContact,BaseGgpFacility::getContactPhone,
+                            BaseGgpFacility::getCheckComment);
+                }
+            }
+            query.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown, baseGgpFacilityVO.getStreetTown());
+            query.in(CollectionUtils.isNotEmpty(baseGgpFacilityVO.getFacilityType()),BaseGgpFacility::getFacilityType,
+                    baseGgpFacilityVO.getFacilityType());
+            list = this.list(query);
         }
-        List<BaseGgpFacility> list = this.list(query);
 //        if (CollectionUtils.isNotEmpty(list)) {
 //            for (int j = 0; j < list.size(); j++) {
 //                BaseGgpFacilityListVO baseGgpFacilityListVO = new BaseGgpFacilityListVO();