版本1.4.1

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,16 @@ public class GRoadSectionInspectionController extends BaseController {
 
     private final IGRoadSectionInspectionService iGRoadSectionInspectionService;
 
+    @ApiOperation("审核路段巡查")
+    @PreAuthorize("@ss.hasPermi('gas:roadSectionInspection:edit')")
+    @Log(title = "路段巡查", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("batchReviews")
+    public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
+        return toAjax(iGRoadSectionInspectionService.batchReview(bo));
+    }
+
+
     /**
      * 查询路段巡查列表
      */

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

@@ -28,7 +28,7 @@ public class GUser extends BaseEntity {
     private Long id;
 
     /**
-     * 姓名
+     * 岗位(几对)
      */
     private Long ranks;
     /**

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

@@ -27,6 +27,7 @@ public class GCourtyardNetworkManagementBo extends BaseEntity {
     private String processComments;
     private String ranks;
     private String areaName;
+    private String areaId;
     /**
      * 主键id
      */

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

@@ -10,6 +10,8 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 调压箱管理业务对象 g_pressure_regulating_box
@@ -117,4 +119,9 @@ public class GPressureRegulatingBoxBo extends BaseEntity {
     private String isAsc;
 
     private GPressureRegulatingBoxDetailsBo pressureRegulatingBoxDetailsBo;
+
+    /**
+     * 时间范围查询
+     */
+    private List<Date> createTimes;
 }

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,6 +28,10 @@ public class GRegulatingBoxMaintenanceBo extends BaseEntity {
     private String processStatus;
     private List<Long> uids;
     /**
+     * 时间范围查询
+     */
+    private List<Date> createTimes;
+    /**
      * 主键
      */
     @ApiModelProperty(value = "主键", required = true)

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

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -271,4 +272,9 @@ public class GRegulatorBoxBo extends BaseEntity {
     private String remark;
     private String processStatus;
 
+    /**
+     * 时间范围查询
+     */
+    private List<Date> createTimes;
+
 }

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

@@ -27,6 +27,10 @@ public class GValveWellInspectionBo extends BaseEntity {
     private String remarks;
     private String processStatus;
     /**
+     * 时间范围
+     */
+    private List<Date> createTimes;
+    /**
      *
      */
     @ApiModelProperty(value = "", required = true)

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;
@@ -53,4 +54,6 @@ public interface IGRoadSectionInspectionService extends IServicePlus<GRoadSectio
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	Boolean batchReview(BatchReviewBo bo);
 }

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

@@ -165,6 +165,10 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), GPressureRegulatingBox::getLongitude, bo.getLongitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), GPressureRegulatingBox::getLatitude, bo.getLatitude());
         lqw.like(StringUtils.isNotBlank(bo.getInspector()), GPressureRegulatingBox::getInspector, bo.getInspector());
+        if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
+           lqw.ge(GPressureRegulatingBox::getCreateTime, bo.getCreateTimes().get(0));
+           lqw.le(GPressureRegulatingBox::getCreateTime, bo.getCreateTimes().get(1));
+        }
         return lqw;
     }
 

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GPressureRegulatingBox;
 import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
 import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
@@ -89,6 +90,10 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
 //        lqw.like(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
         lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GRegulatingBoxMaintenance::getCreateBy, bo.getCreateBy());
         lqw.orderByDesc(GRegulatingBoxMaintenance::getCreateTime);
+        if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
+            lqw.ge(GRegulatingBoxMaintenance::getCreateTime, bo.getCreateTimes().get(0));
+            lqw.le(GRegulatingBoxMaintenance::getCreateTime, bo.getCreateTimes().get(1));
+        }
         return lqw;
     }
 

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

@@ -8,6 +8,7 @@ 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.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
@@ -19,6 +20,7 @@ import com.ruoyi.gas.service.IGRegulatorBoxPhotoService;
 import com.ruoyi.gas.service.IGRegulatorBoxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -113,6 +115,10 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
         lqw.eq(bo.getValveWellTesting() != null, GRegulatorBox::getValveWellTesting, bo.getValveWellTesting());
         lqw.eq(StringUtils.isNotBlank(bo.getValveWellCondition()), GRegulatorBox::getValveWellCondition, bo.getValveWellCondition());
         lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GRegulatorBox::getRemarks, bo.getRemarks());
+        if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
+            lqw.ge(GRegulatorBox::getCreateTime, bo.getCreateTimes().get(0));
+            lqw.le(GRegulatorBox::getCreateTime, bo.getCreateTimes().get(1));
+        }
         return lqw;
     }
 

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

@@ -8,7 +8,9 @@ import com.ruoyi.common.core.page.PagePlus;
 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.GRoadSectionInspection;
+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;
@@ -18,12 +20,10 @@ import com.ruoyi.gas.service.IGRoadSectionInspectionService;
 import com.ruoyi.gas.service.IGUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 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;
 
 /**
@@ -150,4 +150,19 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         }
         return removeByIds(ids);
     }
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean batchReview(BatchReviewBo bo) {
+        List<GRoadSectionInspection> list = new ArrayList<>();
+        if (!ObjectUtils.isEmpty(bo.getUids())) {
+            bo.getUids().forEach(item -> {
+                GRoadSectionInspection roadSectionInspection = new GRoadSectionInspection();
+                roadSectionInspection.setId(item);
+                roadSectionInspection.setProcessStatus(bo.getProcessStatus());
+                roadSectionInspection.setRemarks(bo.getRemarks());
+                list.add(roadSectionInspection);
+            });
+        }
+        return updateBatchById(list);
+    }
 }

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

@@ -63,6 +63,7 @@ public class GUserServiceImpl extends ServicePlusImpl<GUserMapper, GUser, GUserV
         LambdaQueryWrapper<GUser> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), GUser::getName, bo.getName());
         lqw.like(bo.getJobNum() != null, GUser::getJobNum, bo.getJobNum());
+        lqw.like(bo.getRanks() != null, GUser::getRanks, bo.getRanks());
         lqw.orderByDesc(GUser::getCreateTime);
         return lqw;
     }

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

@@ -39,15 +39,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.findProblem != null  and p.findProblem != ''">
                 and a.find_problem = #{p.findProblem}
             </if>
-            <if test="p.areaName != null  and p.areaName != ''">
-                and d.name LIKE concat('%', #{p.areaName}, '%')
-            </if>
             <if test="p.createBy != null  and p.createBy != ''">
                 and a.create_by = #{p.createBy}
             </if>
             <if test="p.ranks != null and p.ranks != ''">
                 and u.ranks = #{p.ranks}
             </if>
+            <if test="p.areaId != null and p.areaId != ''">
+                and c.area_id = #{p.areaId}
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>

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

@@ -85,6 +85,9 @@ 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.createTimes != null and p.createTimes.size() > 1">
+                and a.create_time BETWEEN #{p.createTimes[0]} and #{p.createTimes[1]}
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>

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

@@ -48,6 +48,9 @@ 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.createTimes != null and p.createTimes.size() > 1">
+            and vwi.create_time BETWEEN #{p.createTimes[0]} and #{p.createTimes[1]}
+        </if>
         ORDER BY
         vwi.create_time DESC
     </select>