消防执法动态-当月执法情况

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemMicroStationController.java

@@ -41,10 +41,11 @@ public class DemMicroStationController {
     @GetMapping("microStationList")
     public ApiResult<CommonPage<Map<String, Object>>> microStationList(@RequestParam(value = "squadron", required = false) String squadron,
                                                                        @RequestParam(value = "stationName", required = false) String stationName,
+                                                                       @RequestParam(value = "stationType", required = false) String stationType,
                                                                        @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
                                                                        @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                                        @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(demMicroStationService.microStationList(squadron, stationName, id, pageNum, pageSize));
+        return ApiResult.success(demMicroStationService.microStationList(squadron, stationName, stationType, id, pageNum, pageSize));
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemMicroStationService.java

@@ -22,12 +22,13 @@ public interface DemMicroStationService extends CrudService<DemMicroStation> {
      *
      * @param squadron    所属中队
      * @param stationName 消防站名称
+     * @param stationType 消防站类型（1：微消站;2：专职站，3：重点微消站）
      * @param id          主键ID
      * @param pageNum     当前页
      * @param pageSize    每页条数
      * @return
      */
-    CommonPage<Map<String, Object>> microStationList(String squadron, String stationName, Integer id, Integer pageNum, Integer pageSize);
+    CommonPage<Map<String, Object>> microStationList(String squadron, String stationName,String stationType, Integer id, Integer pageNum, Integer pageSize);
 
     /**
      * 消防站点管理-修改

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

@@ -28,7 +28,7 @@ import java.util.*;
 public class DemMicroStationServiceImpl extends AbstractCrudService<DemMicroStationMapper, DemMicroStation> implements DemMicroStationService {
 
     @Override
-    public CommonPage<Map<String, Object>> microStationList(String squadron, String stationName, Integer id, Integer pageNum, Integer pageSize) {
+    public CommonPage<Map<String, Object>> microStationList(String squadron, String stationName,String stationType,Integer id, Integer pageNum, Integer pageSize) {
         List<Map<String, Object>> list = new ArrayList<>();
         IPage<DemMicroStation> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<DemMicroStation> queryWrapper = Wrappers.lambdaQuery();
@@ -38,6 +38,7 @@ public class DemMicroStationServiceImpl extends AbstractCrudService<DemMicroStat
                 DemMicroStation::getChargePhone, DemMicroStation::getStationType, DemMicroStation::getLongitude,
                 DemMicroStation::getDimension, DemMicroStation::getCreateTime, DemMicroStation::getUpdateTime)
                 .eq(DemMicroStation::getDeleteFlag, 0)
+                .eq(StringUtils.isNotBlank(stationType),DemMicroStation::getStationType,stationType)
                 .like(StringUtils.isNotBlank(squadron), DemMicroStation::getSquadron, squadron)
                 .like(StringUtils.isNotBlank(stationName), DemMicroStation::getStationName, stationName)
                 .orderByDesc(DemMicroStation::getId);