提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MPressureRegulatingBoxController.java

@@ -38,7 +38,8 @@ public class MPressureRegulatingBoxController extends BaseController {
     @ApiOperation("查询调压箱管理列表")
     @GetMapping("/list")
     public TableDataInfo<GPressureRegulatingBoxVo> list(@Validated(QueryGroup.class) GPressureRegulatingBoxBo bo) {
-        return iGPressureRegulatingBoxService.queryPageList(bo);
+//        return iGPressureRegulatingBoxService.queryPageList(bo);
+        return iGPressureRegulatingBoxService.mobileList(bo);
     }
     @ApiOperation("查询调压箱管理详情")
     @GetMapping("/{Id}")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MValveWellPositionController.java

@@ -48,6 +48,7 @@ public class MValveWellPositionController extends BaseController {
     @GetMapping("/list")
     public AjaxResult list(@Validated(QueryGroup.class) GValveWellPositionBo bo) {
         return AjaxResult.success(iGValveWellPositionService.queryPageList(bo));
+//        return AjaxResult.success(iGValveWellPositionService.mobileList(bo));
     }
     /**
      * 导出阀井位置列表

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GPressureRegulatingBoxMapper.java

@@ -1,8 +1,11 @@
 package com.ruoyi.gas.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.gas.domain.GPressureRegulatingBox;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxExcelVo;
+import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,5 +19,6 @@ import java.util.List;
 public interface GPressureRegulatingBoxMapper extends BaseMapperPlus<GPressureRegulatingBox> {
     GPressureRegulatingBox getByNumber(@Param("number") String number, @Param("name") String name, @Param("managementOffice") String managementOffice);
     List<GPressureRegulatingBoxExcelVo> getExcelList();
+    Page<GPressureRegulatingBoxVo> mobileList(@Param("bo") GPressureRegulatingBoxBo bo, Page<?> page);
 
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GValveWellPositionMapper.java

@@ -1,7 +1,13 @@
 package com.ruoyi.gas.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.gas.domain.GValveWellPosition;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo;
+import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
+import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
+import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,5 +18,5 @@ import java.util.List;
  * @date 2024-03-18
  */
 public interface GValveWellPositionMapper extends BaseMapperPlus<GValveWellPosition> {
-
+    Page<GValveWellPositionVo> mobileList(@Param("bo") GValveWellPositionBo bo, Page<?> page);
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGPressureRegulatingBoxService.java

@@ -33,6 +33,7 @@ public interface IGPressureRegulatingBoxService extends IServicePlus<GPressureRe
 	 * 查询列表
 	 */
     TableDataInfo<GPressureRegulatingBoxVo> queryPageList(GPressureRegulatingBoxBo bo);
+    TableDataInfo<GPressureRegulatingBoxVo> mobileList(GPressureRegulatingBoxBo bo);
 
 	/**
 	 * 查询列表

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGValveWellPositionService.java

@@ -29,6 +29,7 @@ public interface IGValveWellPositionService extends IServicePlus<GValveWellPosit
 	 * 查询列表
 	 */
     TableDataInfo<GValveWellPositionVo> queryPageList(GValveWellPositionBo bo);
+    TableDataInfo<GValveWellPositionVo> mobileList(GValveWellPositionBo bo);
 
 	/**
 	 * 查询列表

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPressureRegulatingBoxServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -16,10 +17,7 @@ import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo;
 import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxDetailsBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxRelationBo;
-import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxDetailsVo;
-import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxExcelVo;
-import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
-import com.ruoyi.gas.domain.vo.GRegulatorBoxRelationVo;
+import com.ruoyi.gas.domain.vo.*;
 import com.ruoyi.gas.mapper.GPressureRegulatingBoxMapper;
 import com.ruoyi.gas.service.IGPressureRegulatingBoxDetailsService;
 import com.ruoyi.gas.service.IGPressureRegulatingBoxService;
@@ -153,6 +151,12 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
     }
 
     @Override
+    public TableDataInfo<GPressureRegulatingBoxVo> mobileList(GPressureRegulatingBoxBo bo) {
+        Page<GPressureRegulatingBoxVo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        return PageUtils.buildDataInfo(baseMapper.mobileList(bo, page));
+    }
+
+    @Override
     public List<GPressureRegulatingBoxVo> queryList(GPressureRegulatingBoxBo bo) {
         return listVo(buildQueryWrapper(bo));
     }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRoadSectionInspectionServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -107,8 +108,7 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         if (!"-1".equals(bo.getProcessStatus())) {
             lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GRoadSectionInspection::getProcessStatus, bo.getProcessStatus());
         }else{
-            lqw.or().in(StringUtils.isNotBlank(bo.getProcessStatus()), GRoadSectionInspection::getProcessStatus, "-1","");
-            lqw.or().isNull(GRoadSectionInspection::getProcessStatus);
+            lqw.apply(" (process_status IS NULL OR process_status IN ( '-1', '' )) ");
         }
         if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
             lqw.ge(GRoadSectionInspection::getCreateTime, bo.getCreateTimes().get(0));

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellPositionServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -15,6 +16,7 @@ import com.ruoyi.gas.domain.GValveWellPosition;
 import com.ruoyi.gas.domain.GValvewellRelation;
 import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
 import com.ruoyi.gas.domain.bo.GValvewellRelationBo;
+import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
 import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
 import com.ruoyi.gas.domain.vo.GValvewellRelationVo;
 import com.ruoyi.gas.domain.vo.GWellPositionImportVo;
@@ -105,6 +107,12 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
     }
 
     @Override
+    public TableDataInfo<GValveWellPositionVo> mobileList(GValveWellPositionBo bo) {
+        Page<GValveWellPositionVo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        return PageUtils.buildDataInfo(baseMapper.mobileList(bo, page));
+    }
+
+    @Override
     public List<GValveWellPositionVo> queryList(GValveWellPositionBo bo) {
         return listVo(buildQueryWrapper(bo));
     }

ruoyi-gas/src/main/resources/mapper/GPressureRegulatingBoxMapper.xml

@@ -62,4 +62,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN g_pressure_regulating_box_details bd ON b.id = bd.regulating_box_id
     </select>
 
+	<select id="mobileList" parameterType="com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo" resultType="com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo">
+		SELECT
+		a.id,
+		a.nature,
+		a.type,
+		a.number_of_routes as numberOfRoutes,
+		a.management_office as managementOffice,
+		a.number,
+		a.name,
+		a.inspection_frequency as inspectionFrequency,
+		a.inspector
+		FROM
+			g_pressure_regulating_box a
+				LEFT JOIN g_regulator_box_relation b ON a.id = b.regulator_box_id
+		WHERE
+			b.del_flag = '0'
+		  AND a.del_flag = '0'
+		  <if test="bo.inspector != null and bo.inspector!=''">
+		  	and b.user_id=#{bo.inspector}
+		  </if>
+		<if test="bo.name != null and bo.name!=''">
+		  and a.name LIKE concat('%',#{bo.name},'%')
+		</if>
+		<if test="bo.managementOffice != null and bo.managementOffice!=''">
+			and a.management_office=#{bo.managementOffice}
+		</if>
+		<if test="bo.number != null and bo.number!=''">
+			and a.number LIKE concat('%',#{bo.number},'%')
+		</if>
+	</select>
 </mapper>

ruoyi-gas/src/main/resources/mapper/GValveWellPositionMapper.xml

@@ -18,5 +18,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-
+    <select id="mobileList" parameterType="com.ruoyi.gas.domain.bo.GValveWellPositionBo" resultType="com.ruoyi.gas.domain.vo.GValveWellPositionVo">
+        SELECT
+        a.id,
+        a.valve_well_name as valveWellName,
+        a.position,
+        a.longitude,
+        a.latitude,
+        a.district,
+        a.team,
+        a.valve_head_shape as valveHeadShape,
+        a.valve_well_depth as valveWellDepth,
+        a.manhole_cover_instead as manholeCoverInstead,
+        a.water_condition as waterCondition,
+        a.pressure_rating as pressureRating,
+        a.is_xyxjcnkg as isXyxjcnkg,
+        a.remarks
+        FROM
+        g_valve_well_position a
+        LEFT JOIN g_valvewell_relation b ON a.id = b.regulator_box_id
+        WHERE
+        b.del_flag = '0'
+        AND a.del_flag = '0'
+        <if test="bo.remark != null and bo.remark!=''">
+            and b.user_id=#{bo.remark}
+        </if>
+        <if test="bo.valveWellName != null and bo.valveWellName!=''">
+            and a.valve_well_name LIKE concat('%',#{bo.valveWellName},'%')
+        </if>
+        <if test="bo.position != null and bo.position!=''">
+            and a.position LIKE concat('%',#{bo.position},'%')
+        </if>
+    </select>
 </mapper>