审核筛选加批量审核

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GRoadSectionInspectionController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRoadSectionInspectionBo;
 import com.ruoyi.gas.domain.vo.GRoadSectionInspectionVo;
 import com.ruoyi.gas.service.IGRoadSectionInspectionService;
@@ -42,6 +43,10 @@ public class GRoadSectionInspectionController extends BaseController {
 
     private final IGRoadSectionInspectionService iGRoadSectionInspectionService;
 
+    @PostMapping("batchReview")
+    public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
+        return toAjax(iGRoadSectionInspectionService.batchReview(bo));
+    }
     /**
      * 查询路段巡查列表
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GRotationController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GPatrolTeamController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GPatrolTeamBo;
 import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
 import com.ruoyi.gas.service.IGPatrolTeamService;
@@ -42,6 +43,11 @@ public class GPatrolTeamController extends BaseController {
 
     private final IGPatrolTeamService iGPatrolTeamService;
 
+    @PostMapping("batchReview")
+    public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
+        return toAjax(iGPatrolTeamService.batchReview(bo));
+    }
+
     /**
      * 查询巡检车队列表
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GValveWellInspectionController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
@@ -42,7 +43,10 @@ import java.util.List;
 public class GValveWellInspectionController extends BaseController {
 
     private final IGValveWellInspectionService iGValveWellInspectionService;
-
+    @PostMapping("batchReview")
+    public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
+        return toAjax(iGValveWellInspectionService.batchReview(bo));
+    }
     /**
      * 查询阀井巡查列表
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GPatrolTeam.java

@@ -43,4 +43,8 @@ public class GPatrolTeam extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    private String remark;
+    private String processComments;
+    private String processStatus;
+
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatingBoxMaintenance.java

@@ -20,6 +20,7 @@ public class GRegulatingBoxMaintenance extends BaseEntity {
 
     private static final long serialVersionUID=1L;
     private String processStatus;
+    private String processComments;
     /**
      * 主键
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBox.java

@@ -35,6 +35,7 @@ public class GRegulatorBox extends BaseEntity {
     private Long parentId;
     private String remarks;
     private String processStatus;
+    private String processComments;
     /**
      * 管理所
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRoadSectionInspection.java

@@ -22,8 +22,8 @@ public class GRoadSectionInspection extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
-    private String remarks;
     private String processStatus;
+    private String processComments;
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GValveWellInspection.java

@@ -23,6 +23,7 @@ public class GValveWellInspection extends BaseEntity {
     private static final long serialVersionUID=1L;
     private String remarks;
     private String processStatus;
+    private String processComments;
 
     /**
      *

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GPatrolTeamBo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.gas.domain.bo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
@@ -26,34 +27,38 @@ public class GPatrolTeamBo extends BaseEntity {
     private List<String> photoList;
     private String ranks;
     private List<Long> uids;
+    private String processComments;
+    private String processStatus;
     /**
      *
      */
     @ApiModelProperty(value = "", required = true)
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 班组
      */
     @ApiModelProperty(value = "班组", required = true)
-    @NotBlank(message = "班组不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "班组不能为空", groups = { AddGroup.class, EditGroup.class })
     private String team;
 
     /**
      * 上传位置
      */
     @ApiModelProperty(value = "上传位置", required = true)
-    @NotBlank(message = "上传位置不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "上传位置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String uploadLocation;
 
     /**
      * 是否正常巡检
      */
     @ApiModelProperty(value = "是否正常巡检", required = true)
-    @NotBlank(message = "是否正常巡检不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "是否正常巡检不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isNormalInspection;
 
+    private String remark;
+
 
     /**
      * 分页大小

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatingBoxMaintenanceBo.java

@@ -25,6 +25,7 @@ public class GRegulatingBoxMaintenanceBo extends BaseEntity {
 
     private String ranks;
     private String processStatus;
+    private String processComments;
     private List<Long> uids;
     /**
      * 主键

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java

@@ -270,5 +270,6 @@ public class GRegulatorBoxBo extends BaseEntity {
     private Long parentId;
     private String remark;
     private String processStatus;
+    private String processComments;
 
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRoadSectionInspectionBo.java

@@ -28,8 +28,8 @@ public class GRoadSectionInspectionBo extends BaseEntity {
 
     private String ranks;
     private List<Long> uids;
-    private String remarks;
     private String processStatus;
+    private String processComments;
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GValveWellInspectionBo.java

@@ -26,6 +26,7 @@ public class GValveWellInspectionBo extends BaseEntity {
     private String ranks;
     private String remarks;
     private String processStatus;
+    private String processComments;
     /**
      *
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GPatrolTeamVo.java

@@ -26,7 +26,10 @@ public class GPatrolTeamVo extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 	private List<String> photoList;
 	private String createByName;
-    /**
+	private String processComments;
+	private String processStatus;
+
+	/**
      *
      */
 	@ExcelProperty(value = "")
@@ -55,5 +58,9 @@ public class GPatrolTeamVo extends BaseEntity {
 	@ApiModelProperty("是否正常巡检")
 	private String isNormalInspection;
 
+	@ExcelProperty(value = "备注")
+	@ApiModelProperty("备注")
+	private String remark;
+
 
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatingBoxMaintenanceVo.java

@@ -60,6 +60,7 @@ public class GRegulatingBoxMaintenanceVo extends BaseEntity {
 	@ExcelDictFormat(dictType = "process_status")
 	@ApiModelProperty("审核状态")
 	private String processStatus;
+	private String processComments;
     /**
      * 维护项目
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java

@@ -37,6 +37,7 @@ public class GRegulatorBoxVo extends BaseEntity {
 	private List<String> photoList;
 	private String remark;
 	private String processStatus;
+	private String processComments;
     /**
      * 主键
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRoadSectionInspectionVo.java

@@ -27,8 +27,8 @@ public class GRoadSectionInspectionVo  extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	private List<String> photoList;
-	private String remarks;
 	private String processStatus;
+	private String processComments;
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GValveWellInspectionVo.java

@@ -63,6 +63,7 @@ public class GValveWellInspectionVo extends BaseEntity {
 	private String remark;
 	private String remarks;
 	private String processStatus;
+	private String processComments;
 	private String createByName;
 
 

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GValveWellInspectionVos.java

@@ -26,6 +26,7 @@ public class GValveWellInspectionVos{
 	private String positionName;
 	private String remarks;
 	private String processStatus;
+	private String processComments;
 	private Long positionId;
 	private Date createTime;
 	private String createBy;

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

@@ -1,6 +1,7 @@
 package com.ruoyi.gas.service;
 
 import com.ruoyi.gas.domain.GPatrolTeam;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
 import com.ruoyi.gas.domain.bo.GPatrolTeamBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
@@ -16,6 +17,8 @@ import java.util.List;
  * @date 2024-05-09
  */
 public interface IGPatrolTeamService extends IServicePlus<GPatrolTeam, GPatrolTeamVo> {
+
+	Boolean batchReview(BatchReviewBo bo);
 	/**
 	 * 查询单个
 	 * @return

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

@@ -1,6 +1,7 @@
 package com.ruoyi.gas.service;
 
 import com.ruoyi.gas.domain.GRoadSectionInspection;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.vo.GRoadSectionInspectionVo;
 import com.ruoyi.gas.domain.bo.GRoadSectionInspectionBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
@@ -16,6 +17,8 @@ import java.util.List;
  * @date 2024-03-06
  */
 public interface IGRoadSectionInspectionService extends IServicePlus<GRoadSectionInspection, GRoadSectionInspectionVo> {
+
+	Boolean batchReview(BatchReviewBo bo);
 	/**
 	 * 查询单个
 	 * @return

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

@@ -1,6 +1,7 @@
 package com.ruoyi.gas.service;
 
 import com.ruoyi.gas.domain.GRotation;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.vo.GRotationVo;
 import com.ruoyi.gas.domain.bo.GRotationBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
@@ -16,6 +17,8 @@ import java.util.List;
  * @date 2021-11-16
  */
 public interface IGRotationService extends IServicePlus<GRotation, GRotationVo> {
+
+
 	/**
 	 * 查询单个
 	 * @return

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

@@ -3,6 +3,7 @@ package com.ruoyi.gas.service;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.gas.domain.GValveWellInspection;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
@@ -17,6 +18,7 @@ import java.util.List;
  * @date 2024-03-18
  */
 public interface IGValveWellInspectionService extends IServicePlus<GValveWellInspection, GValveWellInspectionVo> {
+	Boolean batchReview(BatchReviewBo bo);
 	/**
 	 * 查询单个
 	 * @return

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GCourtyardNetworkManagement;
+import com.ruoyi.gas.domain.GValveWellInspection;
 import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GCourtyardNetworkManagementBo;
 import com.ruoyi.gas.domain.bo.GNetworkManagementPhotoBo;
@@ -43,7 +44,7 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
             GCourtyardNetworkManagement gCourtyardNetworkManagement = new GCourtyardNetworkManagement();
             gCourtyardNetworkManagement.setId(item);
             gCourtyardNetworkManagement.setProcessStatus(bo.getProcessStatus());
-            gCourtyardNetworkManagement.setRemarks(bo.getRemarks());
+            gCourtyardNetworkManagement.setProcessComments(bo.getRemarks());
             boxList.add(gCourtyardNetworkManagement);
         });
         return updateBatchById(boxList);

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

@@ -9,6 +9,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GPatrolTeam;
+import com.ruoyi.gas.domain.GRoadSectionInspection;
+import com.ruoyi.gas.domain.GValveWellInspection;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GPatrolTeamBo;
 import com.ruoyi.gas.domain.bo.GPatrolTeamPhotoBo;
 import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
@@ -20,10 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +36,18 @@ import java.util.stream.Collectors;
 public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, GPatrolTeam, GPatrolTeamVo> implements IGPatrolTeamService {
 
     @Override
+    public Boolean batchReview(BatchReviewBo bo) {
+        Collection<GPatrolTeam> boxList = new ArrayList<>();
+        bo.getUids().forEach(item -> {
+            GPatrolTeam gPatrolTeam = new GPatrolTeam();
+            gPatrolTeam.setId(item);
+            gPatrolTeam.setProcessStatus(bo.getProcessStatus());
+            gPatrolTeam.setProcessComments(bo.getRemarks());
+            boxList.add(gPatrolTeam);
+        });
+        return updateBatchById(boxList);
+    }
+    @Override
     public GPatrolTeamVo queryById(Long id) {
         GPatrolTeamVo voById = getVoById(id);
         voById.setPhotoList(baseMapper.getPhoto(id));
@@ -73,6 +85,12 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
         lqw.eq(StringUtils.isNotBlank(bo.getIsNormalInspection()), GPatrolTeam::getIsNormalInspection, bo.getIsNormalInspection());
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GPatrolTeam::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
         lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GPatrolTeam::getCreateBy, bo.getCreateBy());
+        if (!"-1".equals(bo.getProcessStatus())) {
+            lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GPatrolTeam::getProcessStatus, bo.getProcessStatus());
+        }else{
+            lqw.or().in(StringUtils.isNotBlank(bo.getProcessStatus()), GPatrolTeam::getProcessStatus, "-1","");
+            lqw.or().isNull(GPatrolTeam::getProcessStatus);
+        }
         lqw.orderByDesc(GPatrolTeam::getCreateTime);
         return lqw;
     }

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

@@ -9,6 +9,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
+import com.ruoyi.gas.domain.GValveWellInspection;
 import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenancePhotoBo;
@@ -40,7 +41,7 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
             GRegulatingBoxMaintenance gRegulatingBoxMaintenance = new GRegulatingBoxMaintenance();
             gRegulatingBoxMaintenance.setId(item);
             gRegulatingBoxMaintenance.setProcessStatus(bo.getProcessStatus());
-            gRegulatingBoxMaintenance.setRemarks(bo.getRemarks());
+            gRegulatingBoxMaintenance.setProcessComments(bo.getRemarks());
             gRegulatingBoxMaintenances.add(gRegulatingBoxMaintenance);
         });
         return updateBatchById(gRegulatingBoxMaintenances);
@@ -88,6 +89,12 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GRegulatingBoxMaintenance::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
 //        lqw.like(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
         lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GRegulatingBoxMaintenance::getCreateBy, bo.getCreateBy());
+        if (!"-1".equals(bo.getProcessStatus())) {
+            lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GRegulatingBoxMaintenance::getProcessStatus, bo.getProcessStatus());
+        }else{
+            lqw.or().in(StringUtils.isNotBlank(bo.getProcessStatus()), GRegulatingBoxMaintenance::getProcessStatus, "-1","");
+            lqw.or().isNull(GRegulatingBoxMaintenance::getProcessStatus);
+        }
         lqw.orderByDesc(GRegulatingBoxMaintenance::getCreateTime);
         return lqw;
     }

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

@@ -8,7 +8,9 @@ import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
 import com.ruoyi.gas.domain.GRegulatorBox;
+import com.ruoyi.gas.domain.GValveWellInspection;
 import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxPhotoBo;
@@ -45,7 +47,7 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
             GRegulatorBox box = new GRegulatorBox();
             box.setId(item);
             box.setProcessStatus(bo.getProcessStatus());
-            box.setRemarks(bo.getRemarks());
+            box.setProcessComments(bo.getRemarks());
             boxList.add(box);
         });
         return updateBatchById(boxList);

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

@@ -9,6 +9,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GRoadSectionInspection;
+import com.ruoyi.gas.domain.GRotation;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRoadSectionInspectionBo;
 import com.ruoyi.gas.domain.bo.GRoadSectionInspectionPhotoBo;
 import com.ruoyi.gas.domain.vo.GRoadSectionInspectionVo;
@@ -20,10 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -36,6 +35,18 @@ import java.util.stream.Collectors;
 public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSectionInspectionMapper, GRoadSectionInspection, GRoadSectionInspectionVo> implements IGRoadSectionInspectionService {
 
     @Override
+    public Boolean batchReview(BatchReviewBo bo) {
+        Collection<GRoadSectionInspection> boxList = new ArrayList<>();
+        bo.getUids().forEach(item -> {
+            GRoadSectionInspection gRoadSectionInspection = new GRoadSectionInspection();
+            gRoadSectionInspection.setId(item);
+            gRoadSectionInspection.setProcessStatus(bo.getProcessStatus());
+            gRoadSectionInspection.setProcessComments(bo.getRemarks());
+            boxList.add(gRoadSectionInspection);
+        });
+        return updateBatchById(boxList);
+    }
+    @Override
     public GRoadSectionInspectionVo queryById(Long id) {
         GRoadSectionInspectionVo voById = getVoById(id);
         voById.setPhotoList(baseMapper.getPhoto(voById.getId()));
@@ -75,6 +86,13 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         lqw.eq(bo.getFindTime() != null, GRoadSectionInspection::getFindTime, bo.getFindTime());
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GRoadSectionInspection::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
         lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GRoadSectionInspection::getCreateBy, bo.getCreateBy());
+        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.orderByDesc(GRoadSectionInspection::getCreateTime);
         return lqw;
     }

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

@@ -5,6 +5,8 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.gas.domain.GCourtyardNetworkManagement;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -15,6 +17,7 @@ import com.ruoyi.gas.domain.GRotation;
 import com.ruoyi.gas.mapper.GRotationMapper;
 import com.ruoyi.gas.service.IGRotationService;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;

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

@@ -10,6 +10,7 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GRoadSectionInspection;
 import com.ruoyi.gas.domain.GValveWellInspection;
+import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionPhotoBo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
@@ -22,6 +23,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +42,19 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
     private final GValveWellPositionMapper  positionMapper;
 
     @Override
+    public Boolean batchReview(BatchReviewBo bo) {
+        Collection<GValveWellInspection> boxList = new ArrayList<>();
+        bo.getUids().forEach(item -> {
+            GValveWellInspection gValveWellInspection = new GValveWellInspection();
+            gValveWellInspection.setId(item);
+            gValveWellInspection.setProcessStatus(bo.getProcessStatus());
+            gValveWellInspection.setProcessComments(bo.getRemarks());
+            boxList.add(gValveWellInspection);
+        });
+        return updateBatchById(boxList);
+    }
+
+    @Override
     public GValveWellInspectionVo queryById(Long id){
         GValveWellInspectionVo voById = getVoById(id);
         voById.setPhotoList(baseMapper.getPhoto(voById.getId()));

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

@@ -48,6 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.ranks != null and p.ranks != ''">
                 and u.ranks = #{p.ranks}
             </if>
+            <if test="p.processStatus != null and p.processStatus != ''">
+                <if test="p.processStatus != '-1'">
+                    and a.process_status = #{p.processStatus}
+                </if>
+                <if test="p.processStatus == '-1'">
+                    and (a.process_status IN ( '-1', '' ) OR a.process_status IS NULL)
+                </if>
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>

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

@@ -85,6 +85,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.name != null and p.name != ''">
                 and a.name LIKE concat('%', #{p.name}, '%')
             </if>
+            <if test="p.processStatus != null and p.processStatus != ''">
+                <if test="p.processStatus != '-1'">
+                    and a.process_status = #{p.processStatus}
+                </if>
+                <if test="p.processStatus == '-1'">
+                    and (a.process_status IN ( '-1', '' ) OR a.process_status IS NULL)
+                </if>
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>

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

@@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="processStatus" column="process_status"/>
+        <result property="processComments" column="process_comments"/>
     </resultMap>
 
 

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

@@ -48,6 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.createBy != null and p.createBy != ''">
             AND vwi.create_by = #{p.createBy}
         </if>
+        <if test="p.processStatus != null and p.processStatus != ''">
+            <if test="p.processStatus != '-1'">
+                and vwi.process_status = #{p.processStatus}
+            </if>
+            <if test="p.processStatus == '-1'">
+                and (vwi.process_status IN ( '-1', '' ) OR vwi.process_status IS NULL)
+            </if>
+        </if>
         ORDER BY
         vwi.create_time DESC
     </select>