版本1.4.1 路段巡查修改

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

@@ -11,9 +11,12 @@ 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.GCourtyardProcessBo;
 import com.ruoyi.gas.domain.bo.GRoadSectionInspectionBo;
+import com.ruoyi.gas.domain.bo.GRoadsectionProcessBo;
 import com.ruoyi.gas.domain.vo.GRoadSectionInspectionVo;
 import com.ruoyi.gas.service.IGRoadSectionInspectionService;
+import com.ruoyi.gas.service.IGRoadsectionProcessService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -42,6 +45,8 @@ import java.util.List;
 public class GRoadSectionInspectionController extends BaseController {
 
     private final IGRoadSectionInspectionService iGRoadSectionInspectionService;
+    @Autowired
+    private IGRoadsectionProcessService processService;
 
     @ApiOperation("审核路段巡查")
     @PreAuthorize("@ss.hasPermi('gas:roadSectionInspection:edit')")
@@ -51,7 +56,13 @@ public class GRoadSectionInspectionController extends BaseController {
     public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
         return toAjax(iGRoadSectionInspectionService.batchReview(bo));
     }
-
+    /**
+     * 查询审核明细
+     */
+    @GetMapping("/reviewList")
+    public TableDataInfo reviewList(@Validated(QueryGroup.class) GRoadsectionProcessBo bo) {
+        return processService.queryPageList(bo);
+    }
 
     /**
      * 查询路段巡查列表

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

@@ -0,0 +1,57 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 次高压管理审核对象 g_roadsection_process
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_roadsection_process")
+public class GRoadsectionProcess extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 上级id
+     */
+    private Long emrId;
+    /**
+     * 审核状态
+     */
+    private String processStatus;
+    /**
+     * 审核意见
+     */
+    private String processComments;
+    /**
+     * 审核人岗位
+     */
+    private String userPost;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -30,6 +30,9 @@ public class GRoadSectionInspectionBo extends BaseEntity {
     private List<Long> uids;
     private String processStatus;
     private String processComments;
+    private String postNameArias;
+
+    private List<Date> createTimes;
     /**
      * 主键id
      */

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

@@ -0,0 +1,94 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 次高压管理审核业务对象 g_roadsection_process
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("次高压管理审核业务对象")
+public class GRoadsectionProcessBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @ApiModelProperty(value = "", required = true)
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 上级id
+     */
+    @ApiModelProperty(value = "上级id", required = true)
+    @NotNull(message = "上级id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long emrId;
+
+    /**
+     * 审核状态
+     */
+    @ApiModelProperty(value = "审核状态", required = true)
+    @NotBlank(message = "审核状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String processStatus;
+
+    /**
+     * 审核意见
+     */
+    @ApiModelProperty(value = "审核意见", required = true)
+    @NotBlank(message = "审核意见不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String processComments;
+
+    /**
+     * 审核人岗位
+     */
+    @ApiModelProperty(value = "审核人岗位", required = true)
+    @NotBlank(message = "审核人岗位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String userPost;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", required = true)
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remarks;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

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

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
 import java.util.Date;
+import java.util.List;
 
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -24,6 +25,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @ApiModel("阀井巡查审核业务对象")
 public class GValvewellInspectionProcessBo extends BaseEntity {
 
+    //时间范围
+    List<Date> createTimes;
+
     /**
      * 
      */

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

@@ -29,6 +29,7 @@ public class GRoadSectionInspectionVo  extends BaseEntity {
 	private List<String> photoList;
 	private String processStatus;
 	private String processComments;
+	private Boolean flag;
     /**
      * 主键id
      */

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

@@ -0,0 +1,71 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 次高压管理审核视图对象 g_roadsection_process
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Data
+@ApiModel("次高压管理审核视图对象")
+@ExcelIgnoreUnannotated
+public class GRoadsectionProcessVo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@ExcelProperty(value = "")
+	@ApiModelProperty("")
+	private Long id;
+
+    /**
+     * 上级id
+     */
+	@ExcelProperty(value = "上级id")
+	@ApiModelProperty("上级id")
+	private Long emrId;
+
+    /**
+     * 审核状态
+     */
+	@ExcelProperty(value = "审核状态")
+	@ApiModelProperty("审核状态")
+	private String processStatus;
+
+    /**
+     * 审核意见
+     */
+	@ExcelProperty(value = "审核意见")
+	@ApiModelProperty("审核意见")
+	private String processComments;
+
+    /**
+     * 审核人岗位
+     */
+	@ExcelProperty(value = "审核人岗位")
+	@ApiModelProperty("审核人岗位")
+	private String userPost;
+
+    /**
+     * 备注
+     */
+	@ExcelProperty(value = "备注")
+	@ApiModelProperty("备注")
+	private String remarks;
+
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GRoadsectionProcess;
+
+/**
+ * 次高压管理审核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+public interface GRoadsectionProcessMapper extends BaseMapperPlus<GRoadsectionProcess> {
+
+}

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

@@ -0,0 +1,56 @@
+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.GRoadsectionProcess;
+import com.ruoyi.gas.domain.bo.GRoadsectionProcessBo;
+import com.ruoyi.gas.domain.vo.GRoadsectionProcessVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 次高压管理审核Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+public interface IGRoadsectionProcessService extends IServicePlus<GRoadsectionProcess, GRoadsectionProcessVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GRoadsectionProcessVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GRoadsectionProcessVo> queryPageList(GRoadsectionProcessBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GRoadsectionProcessVo> queryList(GRoadsectionProcessBo bo);
+
+	/**
+	 * 根据新增业务对象插入次高压管理审核
+	 * @param bo 次高压管理审核新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GRoadsectionProcessBo bo);
+
+	/**
+	 * 根据编辑业务对象修改次高压管理审核
+	 * @param bo 次高压管理审核编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GRoadsectionProcessBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -2,21 +2,20 @@ package com.ruoyi.gas.service.impl;
 
 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.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 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.*;
+import com.ruoyi.gas.domain.bo.*;
 import com.ruoyi.gas.domain.vo.GRoadSectionInspectionVo;
 import com.ruoyi.gas.mapper.GRoadSectionInspectionMapper;
 import com.ruoyi.gas.service.IGRoadSectionInspectionPhotoService;
 import com.ruoyi.gas.service.IGRoadSectionInspectionService;
+import com.ruoyi.gas.service.IGRoadsectionProcessService;
 import com.ruoyi.gas.service.IGUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,6 +55,27 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         tableDataInfo.getRows().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
             item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+
+            //按照顺序审核
+            //未审核过队长先展示
+            List<GRoadsectionProcess> listed = roadsectionProcessService.list(new QueryWrapper<GRoadsectionProcess>().eq("emr_id", item.getId()));
+            if (ObjectUtils.isEmpty(listed)){
+                String regex = "^(xx|XX).{2}";
+                if (bo.getPostNameArias().matches(regex)){
+                    item.setFlag(true);
+                }
+            }
+            else {
+                //审核过
+                //该岗位审核过就不显示
+                listed.forEach(o->{
+                    if (o.getUserPost().equals(bo.getPostNameArias())){
+                        item.setFlag(false);
+                    }else {
+                        item.setFlag(true);
+                    }
+                });
+            }
         });
         return tableDataInfo;
     }
@@ -81,7 +101,10 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
             lqw.or().in(StringUtils.isNotBlank(bo.getProcessStatus()), GRoadSectionInspection::getProcessStatus, "-1","");
             lqw.or().isNull(GRoadSectionInspection::getProcessStatus);
         }
-
+        if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
+            lqw.ge(GRoadSectionInspection::getCreateTime, bo.getCreateTimes().get(0));
+            lqw.le(GRoadSectionInspection::getCreateTime, bo.getCreateTimes().get(1));
+        }
         lqw.orderByDesc(GRoadSectionInspection::getCreateTime);
         return lqw;
     }
@@ -111,10 +134,23 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(GRoadSectionInspectionBo bo) {
         GRoadSectionInspection update = BeanUtil.toBean(bo, GRoadSectionInspection.class);
         validEntityBeforeSave(update);
         List<String> piclist = bo.getPhotoList();
+        //审核-队长-处事，由一步审核变为两步审核
+        if (StringUtils.isNotBlank(bo.getProcessStatus())){
+            GRoadsectionProcessBo processBo = new GRoadsectionProcessBo();
+            processBo.setEmrId(bo.getId());
+            processBo.setProcessStatus(bo.getProcessStatus());
+            processBo.setProcessComments(bo.getProcessComments());
+            processBo.setUserPost(bo.getPostNameArias());
+//            processBo.setCreateBy(SecurityUtils.getUserId().toString());
+//            processBo.setCreateTime(new Date());
+            processBo.setUserPost(bo.getPostNameArias());
+            roadsectionProcessService.insertByBo(processBo);
+        }
         if (piclist != null) {
             //原有的照片
             List<String> photolist = baseMapper.getPhoto(bo.getId());
@@ -138,7 +174,16 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
                 }
             }
         }
-        return updateById(update);
+        update.setProcessStatus(null);
+        boolean b = updateById(update);
+        if (StringUtils.isNotBlank(bo.getProcessStatus())){
+            //更新主表状态
+            Collection<GRoadSectionInspection> collection = new ArrayList<>();
+            update.setProcessStatus(bo.getProcessStatus());
+            collection.add(update);
+            updateNetworkManage(collection);
+        }
+        return b;
     }
 
     /**
@@ -150,26 +195,62 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         //TODO 做一些数据校验,如唯一约束
     }
 
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if (isValid) {
+        if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        roadsectionProcessService.remove(new QueryWrapper<GRoadsectionProcess>().in("emr_id", ids));
         return removeByIds(ids);
     }
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean batchReview(BatchReviewBo bo) {
         List<GRoadSectionInspection> list = new ArrayList<>();
+        Collection<GRoadsectionProcess> processList = new ArrayList<>();
+
         if (!ObjectUtils.isEmpty(bo.getUids())) {
             bo.getUids().forEach(item -> {
                 GRoadSectionInspection roadSectionInspection = new GRoadSectionInspection();
                 roadSectionInspection.setId(item);
-                roadSectionInspection.setProcessStatus(bo.getProcessStatus());
-                roadSectionInspection.setProcessComments(bo.getRemarks());
+//                roadSectionInspection.setProcessStatus(bo.getProcessStatus());
+//                roadSectionInspection.setProcessComments(bo.getRemarks());
+                GRoadsectionProcess processBo = new GRoadsectionProcess();
+                processBo.setEmrId(item);
+                processBo.setProcessStatus(bo.getProcessStatus());
+                processBo.setProcessComments(bo.getProcessComments());
+                processBo.setUserPost(bo.getPostNameArias());
+                processList.add(processBo);
+
                 list.add(roadSectionInspection);
             });
         }
-        return updateBatchById(list);
+        boolean b = roadsectionProcessService.saveBatch(processList);
+//        boolean b = updateBatchById(boxList);
+        //更新主表状态
+        updateNetworkManage(list);
+        return b;
     }
+
+    //    @Async
+    public void updateNetworkManage(Collection<GRoadSectionInspection> boxList) {
+        boxList.stream().forEach(obj->{
+            QueryWrapper<GRoadsectionProcess> queryWrapper = new QueryWrapper<GRoadsectionProcess>().eq("emr_id", obj.getId());
+            List<GRoadsectionProcess> listed = roadsectionProcessService.list(queryWrapper);
+            if (listed.stream().filter(o->o.getProcessStatus().equals("0")).count()==2) {
+                obj.setProcessStatus("0");
+                updateById(obj);
+            }else if (listed.stream().anyMatch(o -> o.getProcessStatus().equals("1"))) {
+                obj.setProcessStatus("1");
+                updateById(obj);
+            }
+        });
+    }
+
+    @Autowired
+    private IGRoadsectionProcessService roadsectionProcessService;
 }

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

@@ -0,0 +1,92 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+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.GRoadsectionProcess;
+import com.ruoyi.gas.domain.bo.GRoadsectionProcessBo;
+import com.ruoyi.gas.domain.vo.GRoadsectionProcessVo;
+import com.ruoyi.gas.mapper.GRoadsectionProcessMapper;
+import com.ruoyi.gas.service.IGRoadsectionProcessService;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 次高压管理审核Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Service
+public class GRoadsectionProcessServiceImpl extends ServicePlusImpl<GRoadsectionProcessMapper, GRoadsectionProcess, GRoadsectionProcessVo> implements IGRoadsectionProcessService {
+
+    @Override
+    public GRoadsectionProcessVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GRoadsectionProcessVo> queryPageList(GRoadsectionProcessBo bo) {
+        PagePlus<GRoadsectionProcess, GRoadsectionProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GRoadsectionProcessVo> queryList(GRoadsectionProcessBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GRoadsectionProcess> buildQueryWrapper(GRoadsectionProcessBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GRoadsectionProcess> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEmrId() != null, GRoadsectionProcess::getEmrId, bo.getEmrId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GRoadsectionProcess::getProcessStatus, bo.getProcessStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessComments()), GRoadsectionProcess::getProcessComments, bo.getProcessComments());
+        lqw.eq(StringUtils.isNotBlank(bo.getUserPost()), GRoadsectionProcess::getUserPost, bo.getUserPost());
+        lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GRoadsectionProcess::getRemarks, bo.getRemarks());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GRoadsectionProcessBo bo) {
+        GRoadsectionProcess add = BeanUtil.toBean(bo, GRoadsectionProcess.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GRoadsectionProcessBo bo) {
+        GRoadsectionProcess update = BeanUtil.toBean(bo, GRoadsectionProcess.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GRoadsectionProcess entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

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

@@ -165,6 +165,7 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(GValveWellInspectionBo bo) {
         GValveWellInspection update = BeanUtil.toBean(bo, GValveWellInspection.class);
         validEntityBeforeSave(update);

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

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
 import com.ruoyi.gas.domain.GValvewellInspectionProcess;
 import com.ruoyi.gas.domain.bo.GValvewellInspectionProcessBo;
 import com.ruoyi.gas.domain.vo.GValvewellInspectionProcessVo;
@@ -15,6 +16,7 @@ import com.ruoyi.gas.service.IGValvewellInspectionProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.util.ObjectUtils;
 
 import java.util.List;
 import java.util.Map;
@@ -55,6 +57,10 @@ public class GValvewellInspectionProcessServiceImpl extends ServicePlusImpl<GVal
         lqw.eq(StringUtils.isNotBlank(bo.getUserPost()), GValvewellInspectionProcess::getUserPost, bo.getUserPost());
         lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GValvewellInspectionProcess::getRemarks, bo.getRemarks());
         lqw.orderByDesc(GValvewellInspectionProcess::getCreateTime);
+        if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
+            lqw.ge(GValvewellInspectionProcess::getCreateTime, bo.getCreateTimes().get(0));
+            lqw.le(GValvewellInspectionProcess::getCreateTime, bo.getCreateTimes().get(1));
+        }
         return lqw;
     }