版本1.4.1 审核修改

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GPatrolTeamController.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.GPatrolTeamBo;
+import com.ruoyi.gas.domain.bo.GTeamProcessBo;
 import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
 import com.ruoyi.gas.service.IGPatrolTeamService;
+import com.ruoyi.gas.service.IGTeamProcessService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -42,12 +45,20 @@ import java.util.List;
 public class GPatrolTeamController extends BaseController {
 
     private final IGPatrolTeamService iGPatrolTeamService;
+    @Autowired
+    private IGTeamProcessService teamProcessService;
 
     @PostMapping("batchReview")
     public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
         return toAjax(iGPatrolTeamService.batchReview(bo));
     }
-
+    /**
+     * 查询审核明细
+     */
+    @GetMapping("/reviewList")
+    public TableDataInfo reviewList(@Validated(QueryGroup.class) GTeamProcessBo bo) {
+        return teamProcessService.queryPageList(bo);
+    }
     /**
      * 查询巡检车队列表
      */

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

@@ -12,8 +12,10 @@ 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.GMaintenanceProcessBo;
 import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
 import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
+import com.ruoyi.gas.service.IGMaintenanceProcessService;
 import com.ruoyi.gas.service.IGRegulatingBoxMaintenanceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -44,7 +46,7 @@ public class GRegulatingBoxMaintenanceController extends BaseController {
 
     private final IGRegulatingBoxMaintenanceService iGRegulatingBoxMaintenanceService;
     @Autowired
-    private IGRegulatingBoxMaintenanceService maintenanceService;
+    private IGMaintenanceProcessService processService;
 
     /**
      * 批量审核
@@ -57,8 +59,8 @@ public class GRegulatingBoxMaintenanceController extends BaseController {
      * 查询审核明细
      */
     @GetMapping("/reviewList")
-    public TableDataInfo reviewList(@Validated(QueryGroup.class) GRegulatingBoxMaintenanceBo bo) {
-        return maintenanceService.queryPageList(bo);
+    public TableDataInfo reviewList(@Validated(QueryGroup.class) GMaintenanceProcessBo bo) {
+        return processService.queryPageList(bo);
     }
     /**
      * 查询调压箱维护列表

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GTeamProcess.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_team_process
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_team_process")
+public class GTeamProcess 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/GPatrolTeamBo.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,6 +30,8 @@ public class GPatrolTeamBo extends BaseEntity {
     private List<Long> uids;
     private String processComments;
     private String processStatus;
+    private String postNameArias;
+    private List<Date> createTimes;
     /**
      *
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GTeamProcessBo.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_team_process
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("巡检车队审核业务对象")
+public class GTeamProcessBo 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/vo/GMaintenanceProcessVo.java

@@ -4,6 +4,7 @@ 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;
@@ -20,7 +21,7 @@ import java.util.Date;
 @Data
 @ApiModel("调压箱维护审核视图对象")
 @ExcelIgnoreUnannotated
-public class GMaintenanceProcessVo {
+public class GMaintenanceProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -28,6 +28,7 @@ public class GPatrolTeamVo extends BaseEntity {
 	private String createByName;
 	private String processComments;
 	private String processStatus;
+	private Boolean flag;
 
 	/**
      *

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GTeamProcessVo.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_team_process
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Data
+@ApiModel("巡检车队审核视图对象")
+@ExcelIgnoreUnannotated
+public class GTeamProcessVo 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/GTeamProcessMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GTeamProcess;
+
+/**
+ * 巡检车队审核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+public interface GTeamProcessMapper extends BaseMapperPlus<GTeamProcess> {
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGTeamProcessService.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.GTeamProcess;
+import com.ruoyi.gas.domain.bo.GTeamProcessBo;
+import com.ruoyi.gas.domain.vo.GTeamProcessVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 巡检车队审核Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+public interface IGTeamProcessService extends IServicePlus<GTeamProcess, GTeamProcessVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GTeamProcessVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GTeamProcessVo> queryPageList(GTeamProcessBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GTeamProcessVo> queryList(GTeamProcessBo bo);
+
+	/**
+	 * 根据新增业务对象插入巡检车队审核
+	 * @param bo 巡检车队审核新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GTeamProcessBo bo);
+
+	/**
+	 * 根据编辑业务对象修改巡检车队审核
+	 * @param bo 巡检车队审核编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GTeamProcessBo 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/GCourtyardNetworkManagementServiceImpl.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GCourtyardNetworkManagement;
 import com.ruoyi.gas.domain.GCourtyardProcess;
+import com.ruoyi.gas.domain.GTeamProcess;
 import com.ruoyi.gas.domain.GValvewellInspectionProcess;
 import com.ruoyi.gas.domain.bo.*;
 import com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo;
@@ -50,12 +51,8 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
         Collection<GCourtyardNetworkManagement> boxList = new ArrayList<>();
         Collection<GCourtyardProcess> processList = new ArrayList<>();
         bo.getUids().forEach(item -> {
-
             GCourtyardNetworkManagement gCourtyardNetworkManagement = new GCourtyardNetworkManagement();
             gCourtyardNetworkManagement.setId(item);
-//            gCourtyardNetworkManagement.setProcessStatus(bo.getProcessStatus());
-//            gCourtyardNetworkManagement.setProcessComments(bo.getRemarks());
-
             GCourtyardProcess processBo = new GCourtyardProcess();
             processBo.setEmrId(item);
             processBo.setProcessStatus(bo.getProcessStatus());
@@ -65,7 +62,6 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
             boxList.add(gCourtyardNetworkManagement);
         });
         boolean b = igCourtyardProcessService.saveBatch(processList);
-//        boolean b = updateBatchById(boxList);
         //更新主表状态
         updateNetworkManage(boxList);
         return b;
@@ -74,14 +70,30 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
 //    @Async
     public void updateNetworkManage(Collection<GCourtyardNetworkManagement> boxList) {
         boxList.stream().forEach(obj->{
-            QueryWrapper<GCourtyardProcess> queryWrapper = new QueryWrapper<GCourtyardProcess>().eq("emr_id", obj.getId());
+            //最新一条
+            QueryWrapper<GCourtyardProcess> queryWrapper = new QueryWrapper<GCourtyardProcess>().eq("emr_id", obj.getId()).orderByDesc("create_time");
             List<GCourtyardProcess> listed = igCourtyardProcessService.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);
+            if(!ObjectUtils.isEmpty(listed)) {
+                //队长审核不通过
+                GCourtyardProcess gTeamProcess = listed.get(0);
+                String regex = "^(xx|XX).{2}";
+                if (gTeamProcess.getUserPost().matches(regex)) {
+                    if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("1");
+                        updateById(obj);
+                    }
+                }else {
+                    //处事审核通过 即主表状态通过
+                    if (gTeamProcess.getProcessStatus().equals("0")){
+                        obj.setProcessStatus("0");
+                        updateById(obj);
+                    }
+                    //处事审核不通过
+                    else if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }
+                }
             }
         });
     }
@@ -102,7 +114,7 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
             //按照顺序审核
             //未审核过队长先展示
-            List<GCourtyardProcess> listed = igCourtyardProcessService.list(new QueryWrapper<GCourtyardProcess>().eq("emr_id", item.getId()));
+            List<GCourtyardProcess> listed = igCourtyardProcessService.list(new QueryWrapper<GCourtyardProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -193,18 +205,6 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
         GCourtyardNetworkManagement update = BeanUtil.toBean(bo, GCourtyardNetworkManagement.class);
         validEntityBeforeSave(update);
         List<String> piclist = bo.getPhotoList();
-        //审核-队长-处事，由一步审核变为两步审核
-        if (StringUtils.isNotBlank(bo.getProcessStatus())){
-            GCourtyardProcessBo processBo = new GCourtyardProcessBo();
-            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());
-            igCourtyardProcessService.insertByBo(processBo);
-        }
         if (piclist != null) {
             //原有的照片
             List<String> photolist = baseMapper.getPhoto(bo.getId());
@@ -228,16 +228,8 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
                 }
             }
         }
-        update.setProcessStatus(null);
-        boolean b = updateById(update);
-        if (StringUtils.isNotBlank(bo.getProcessStatus())){
-            //更新主表状态
-            Collection<GCourtyardNetworkManagement> collection = new ArrayList<>();
-            update.setProcessStatus(bo.getProcessStatus());
-            collection.add(update);
-            updateNetworkManage(collection);
-        }
-        return b;
+        update.setProcessStatus("-1");
+        return updateById(update);
     }
 
     /**

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

@@ -52,6 +52,7 @@ public class GCourtyardProcessServiceImpl extends ServicePlusImpl<GCourtyardProc
         lqw.eq(StringUtils.isNotBlank(bo.getProcessComments()), GCourtyardProcess::getProcessComments, bo.getProcessComments());
         lqw.eq(StringUtils.isNotBlank(bo.getUserPost()), GCourtyardProcess::getUserPost, bo.getUserPost());
         lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GCourtyardProcess::getRemarks, bo.getRemarks());
+        lqw.last("order by create_time desc");
         return lqw;
     }
 

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

@@ -2,25 +2,24 @@ 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.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.*;
+import com.ruoyi.gas.domain.bo.*;
 import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
 import com.ruoyi.gas.mapper.GPatrolTeamMapper;
 import com.ruoyi.gas.service.IGPatrolTeamPhotoService;
 import com.ruoyi.gas.service.IGPatrolTeamService;
+import com.ruoyi.gas.service.IGTeamProcessService;
 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.*;
@@ -35,18 +34,63 @@ import java.util.stream.Collectors;
 @Service
 public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, GPatrolTeam, GPatrolTeamVo> implements IGPatrolTeamService {
 
+    @Autowired
+    private IGTeamProcessService teamProcessService;
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean batchReview(BatchReviewBo bo) {
         Collection<GPatrolTeam> boxList = new ArrayList<>();
+        Collection<GTeamProcess> processList = new ArrayList<>();
         bo.getUids().forEach(item -> {
             GPatrolTeam gPatrolTeam = new GPatrolTeam();
             gPatrolTeam.setId(item);
-            gPatrolTeam.setProcessStatus(bo.getProcessStatus());
-            gPatrolTeam.setProcessComments(bo.getRemarks());
+            GTeamProcess processBo = new GTeamProcess();
+            processBo.setEmrId(item);
+            processBo.setProcessStatus(bo.getProcessStatus());
+            processBo.setProcessComments(bo.getProcessComments());
+            processBo.setUserPost(bo.getPostNameArias());
+            processList.add(processBo);
+
             boxList.add(gPatrolTeam);
         });
-        return updateBatchById(boxList);
+        boolean b = teamProcessService.saveBatch(processList);
+        //更新主表状态
+        updateNetworkManage(boxList);
+        return b;
+    }
+
+    //    @Async
+    public void updateNetworkManage(Collection<GPatrolTeam> boxList) {
+        boxList.stream().forEach(obj->{
+            //最新一条
+            QueryWrapper<GTeamProcess> queryWrapper = new QueryWrapper<GTeamProcess>().eq("emr_id", obj.getId()).orderByDesc("create_time");
+            List<GTeamProcess> listed = teamProcessService.list(queryWrapper);
+            if(!ObjectUtils.isEmpty(listed)) {
+                //队长审核不通过
+                GTeamProcess gTeamProcess = listed.get(0);
+                String regex = "^(xx|XX).{2}";
+                if (gTeamProcess.getUserPost().matches(regex)) {
+                    if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("1");
+                        updateById(obj);
+                    }
+                }else {
+                    //处事审核通过 即主表状态通过
+                    if (gTeamProcess.getProcessStatus().equals("0")){
+                        obj.setProcessStatus("0");
+                        updateById(obj);
+                    }
+                    //处事审核不通过
+                    else if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }
+                }
+            }
+        });
     }
+
     @Override
     public GPatrolTeamVo queryById(Long id) {
         GPatrolTeamVo voById = getVoById(id);
@@ -67,7 +111,26 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
         PagePlus<GPatrolTeam, GPatrolTeamVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         result.getRecordsVo().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
-            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+
+            //按照顺序审核
+            //未审核过队长先展示
+            List<GTeamProcess> listed = teamProcessService.list(new QueryWrapper<GTeamProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
+            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 PageUtils.buildDataInfo(result);
     }
@@ -83,7 +146,7 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
         lqw.eq(StringUtils.isNotBlank(bo.getTeam()), GPatrolTeam::getTeam, bo.getTeam());
         lqw.eq(StringUtils.isNotBlank(bo.getUploadLocation()), GPatrolTeam::getUploadLocation, bo.getUploadLocation());
         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.in(StringUtils.isNotEmpty(bo.getRanks()), GPatrolTeam::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) ? 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());
@@ -91,6 +154,10 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
             lqw.or().in(StringUtils.isNotBlank(bo.getProcessStatus()), GPatrolTeam::getProcessStatus, "-1","");
             lqw.or().isNull(GPatrolTeam::getProcessStatus);
         }
+        if (!ObjectUtils.isEmpty(bo.getCreateTimes())){
+            lqw.ge(GPatrolTeam::getCreateTime, bo.getCreateTimes().get(0));
+            lqw.le(GPatrolTeam::getCreateTime, bo.getCreateTimes().get(1));
+        }
         lqw.orderByDesc(GPatrolTeam::getCreateTime);
         return lqw;
     }
@@ -147,6 +214,7 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
                 }
             }
         }
+        update.setProcessStatus("-1");
         return updateById(update);
     }
 
@@ -160,10 +228,12 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if (isValid) {
+        if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        teamProcessService.remove(new QueryWrapper<GTeamProcess>().in("emr_id", ids));
         return removeByIds(ids);
     }
 }

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

@@ -40,12 +40,9 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
     public Boolean batchReview(BatchReviewBo bo) {
         Collection<GRegulatingBoxMaintenance> gRegulatingBoxMaintenances = new ArrayList<>();
         Collection<GMaintenanceProcess> processList = new ArrayList<>();
-
         bo.getUids().forEach(item -> {
             GRegulatingBoxMaintenance gRegulatingBoxMaintenance = new GRegulatingBoxMaintenance();
             gRegulatingBoxMaintenance.setId(item);
-//            gRegulatingBoxMaintenance.setProcessStatus(bo.getProcessStatus());
-//            gRegulatingBoxMaintenance.setRemarks(bo.getRemarks());
             gRegulatingBoxMaintenances.add(gRegulatingBoxMaintenance);
 
             GMaintenanceProcess processBo = new GMaintenanceProcess();
@@ -57,7 +54,6 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
             processList.add(processBo);
         });
         boolean b = igMaintenanceProcessService.saveBatch(processList);
-//        boolean b = updateBatchById(gRegulatingBoxMaintenances);
         //更新主表状态
         updateNetworkManage(gRegulatingBoxMaintenances);
         return b;
@@ -65,14 +61,30 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
 
     private void updateNetworkManage(Collection<GRegulatingBoxMaintenance> gRegulatingBoxMaintenances) {
         gRegulatingBoxMaintenances.stream().forEach(obj->{
-            QueryWrapper<GMaintenanceProcess> queryWrapper = new QueryWrapper<GMaintenanceProcess>().eq("emr_id", obj.getId());
+            //最新一条
+            QueryWrapper<GMaintenanceProcess> queryWrapper = new QueryWrapper<GMaintenanceProcess>().eq("emr_id", obj.getId()).orderByDesc("create_time");
             List<GMaintenanceProcess> listed = igMaintenanceProcessService.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);
+            if(!ObjectUtils.isEmpty(listed)) {
+                //队长审核不通过
+                GMaintenanceProcess gTeamProcess = listed.get(0);
+                String regex = "^(xx|XX).{2}";
+                if (gTeamProcess.getUserPost().matches(regex)) {
+                    if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("1");
+                        updateById(obj);
+                    }
+                }else {
+                    //处事审核通过 即主表状态通过
+                    if (gTeamProcess.getProcessStatus().equals("0")){
+                        obj.setProcessStatus("0");
+                        updateById(obj);
+                    }
+                    //处事审核不通过
+                    else if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }
+                }
             }
         });
     }
@@ -101,7 +113,7 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
 
             //按照顺序审核
             //未审核过队长先展示
-            List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(new QueryWrapper<GMaintenanceProcess>().eq("emr_id", item.getId()));
+            List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(new QueryWrapper<GMaintenanceProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -183,15 +195,6 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
         GRegulatingBoxMaintenance update = BeanUtil.toBean(bo, GRegulatingBoxMaintenance.class);
         validEntityBeforeSave(update);
         List<String> piclist = bo.getPhotoList();
-        //审核-队长-处事，由一步审核变为两步审核
-        if (StringUtils.isNotBlank(bo.getProcessStatus())){
-            GMaintenanceProcessBo processBo = new GMaintenanceProcessBo();
-            processBo.setEmrId(bo.getId());
-            processBo.setProcessStatus(bo.getProcessStatus());
-            processBo.setProcessComments(bo.getRemarks());
-            processBo.setUserPost(bo.getPostNameArias());
-            igMaintenanceProcessService.insertByBo(processBo);
-        }
         if (piclist != null) {
             //原有的照片
             List<String> photolist = baseMapper.getPhoto(bo.getId());
@@ -215,16 +218,8 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
                 }
             }
         }
-        update.setProcessStatus(null);
-        boolean b = updateById(update);
-        if (StringUtils.isNotBlank(bo.getProcessStatus())){
-            //更新主表状态
-            Collection<GRegulatingBoxMaintenance> collection = new ArrayList<>();
-            update.setProcessStatus(bo.getProcessStatus());
-            collection.add(update);
-            updateNetworkManage(collection);
-        }
-        return b;
+        update.setProcessStatus("-1");
+        return updateById(update);
     }
 
     /**

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

@@ -52,6 +52,7 @@ public class GRegulatorBoxProcessServiceImpl extends ServicePlusImpl<GRegulatorB
         lqw.eq(StringUtils.isNotBlank(bo.getProcessComments()), GRegulatorBoxProcess::getProcessComments, bo.getProcessComments());
         lqw.eq(StringUtils.isNotBlank(bo.getUserPost()), GRegulatorBoxProcess::getUserPost, bo.getUserPost());
         lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GRegulatorBoxProcess::getRemarks, bo.getRemarks());
+        lqw.last("order by create_time desc");
         return lqw;
     }
 

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

@@ -53,8 +53,6 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
         bo.getUids().forEach(item -> {
             GRegulatorBox box = new GRegulatorBox();
             box.setId(item);
-//            box.setProcessStatus(bo.getProcessStatus());
-//            box.setRemarks(bo.getRemarks());
             boxList.add(box);
 
             GRegulatorBoxProcess processBo = new GRegulatorBoxProcess();
@@ -65,7 +63,6 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
             processList.add(processBo);
         });
         boolean b = igRegulatorBoxProcessService.saveBatch(processList);
-//        boolean b = updateBatchById(boxList);
         //更新主表状态
         updateNetworkManage(boxList);
         return b;
@@ -73,14 +70,30 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
 
     public void updateNetworkManage(Collection<GRegulatorBox> boxList) {
         boxList.stream().forEach(obj->{
-            QueryWrapper<GRegulatorBoxProcess> queryWrapper = new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", obj.getId());
+            //最新一条
+            QueryWrapper<GRegulatorBoxProcess> queryWrapper = new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", obj.getId()).orderByDesc("create_time");
             List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.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);
+            if(!ObjectUtils.isEmpty(listed)) {
+                //队长审核不通过
+                GRegulatorBoxProcess gTeamProcess = listed.get(0);
+                String regex = "^(xx|XX).{2}";
+                if (gTeamProcess.getUserPost().matches(regex)) {
+                    if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("1");
+                        updateById(obj);
+                    }
+                }else {
+                    //处事审核通过 即主表状态通过
+                    if (gTeamProcess.getProcessStatus().equals("0")){
+                        obj.setProcessStatus("0");
+                        updateById(obj);
+                    }
+                    //处事审核不通过
+                    else if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }
+                }
             }
         });
     }
@@ -100,7 +113,7 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
             //按照顺序审核
             //未审核过队长先展示
-            List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.list(new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", item.getId()));
+            List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.list(new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -204,15 +217,6 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
         GRegulatorBox update = BeanUtil.toBean(bo, GRegulatorBox.class);
         validEntityBeforeSave(update);
         List<String> piclist = bo.getPhotoList();
-        //审核-队长-处事，由一步审核变为两步审核
-        if (StringUtils.isNotBlank(bo.getProcessStatus())){
-            GRegulatorBoxProcessBo processBo = new GRegulatorBoxProcessBo();
-            processBo.setEmrId(bo.getId());
-            processBo.setProcessStatus(bo.getProcessStatus());
-            processBo.setProcessComments(bo.getProcessComments());
-            processBo.setUserPost(bo.getPostNameArias());
-            igRegulatorBoxProcessService.insertByBo(processBo);
-        }
         if (piclist != null) {
             //原有的照片
             List<String> photolist = baseMapper.getPhoto(bo.getId());
@@ -236,16 +240,8 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
                 }
             }
         }
-        update.setProcessStatus(null);
-        boolean b = updateById(update);
-        if (StringUtils.isNotBlank(bo.getProcessStatus())){
-            //更新主表状态
-            Collection<GRegulatorBox> collection = new ArrayList<>();
-            update.setProcessStatus(bo.getProcessStatus());
-            collection.add(update);
-            updateNetworkManage(collection);
-        }
-        return b;
+        update.setProcessStatus("-1");
+        return updateById(update);
     }
 
     /**

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

@@ -54,11 +54,11 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         TableDataInfo<GRoadSectionInspectionVo> tableDataInfo = PageUtils.buildDataInfo(result);
         tableDataInfo.getRows().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
-            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+//            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
 
             //按照顺序审核
             //未审核过队长先展示
-            List<GRoadsectionProcess> listed = roadsectionProcessService.list(new QueryWrapper<GRoadsectionProcess>().eq("emr_id", item.getId()));
+            List<GRoadsectionProcess> listed = roadsectionProcessService.list(new QueryWrapper<GRoadsectionProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -139,18 +139,6 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         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());
@@ -174,16 +162,8 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
                 }
             }
         }
-        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;
+        update.setProcessStatus("-1");
+        return updateById(update);
     }
 
     /**
@@ -217,8 +197,6 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
             bo.getUids().forEach(item -> {
                 GRoadSectionInspection roadSectionInspection = new GRoadSectionInspection();
                 roadSectionInspection.setId(item);
-//                roadSectionInspection.setProcessStatus(bo.getProcessStatus());
-//                roadSectionInspection.setProcessComments(bo.getRemarks());
                 GRoadsectionProcess processBo = new GRoadsectionProcess();
                 processBo.setEmrId(item);
                 processBo.setProcessStatus(bo.getProcessStatus());
@@ -230,7 +208,6 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
             });
         }
         boolean b = roadsectionProcessService.saveBatch(processList);
-//        boolean b = updateBatchById(boxList);
         //更新主表状态
         updateNetworkManage(list);
         return b;
@@ -239,14 +216,30 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
     //    @Async
     public void updateNetworkManage(Collection<GRoadSectionInspection> boxList) {
         boxList.stream().forEach(obj->{
-            QueryWrapper<GRoadsectionProcess> queryWrapper = new QueryWrapper<GRoadsectionProcess>().eq("emr_id", obj.getId());
+            //最新一条
+            QueryWrapper<GRoadsectionProcess> queryWrapper = new QueryWrapper<GRoadsectionProcess>().eq("emr_id", obj.getId()).orderByDesc("create_time");
             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);
+            if(!ObjectUtils.isEmpty(listed)) {
+                //队长审核不通过
+                GRoadsectionProcess gTeamProcess = listed.get(0);
+                String regex = "^(xx|XX).{2}";
+                if (gTeamProcess.getUserPost().matches(regex)) {
+                    if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("1");
+                        updateById(obj);
+                    }
+                }else {
+                    //处事审核通过 即主表状态通过
+                    if (gTeamProcess.getProcessStatus().equals("0")){
+                        obj.setProcessStatus("0");
+                        updateById(obj);
+                    }
+                    //处事审核不通过
+                    else if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }
+                }
             }
         });
     }

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

@@ -52,6 +52,7 @@ public class GRoadsectionProcessServiceImpl extends ServicePlusImpl<GRoadsection
         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());
+        lqw.orderByDesc(GRoadsectionProcess::getCreateTime);
         return lqw;
     }
 

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

@@ -0,0 +1,93 @@
+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.GTeamProcess;
+import com.ruoyi.gas.domain.bo.GTeamProcessBo;
+import com.ruoyi.gas.domain.vo.GTeamProcessVo;
+import com.ruoyi.gas.mapper.GTeamProcessMapper;
+import com.ruoyi.gas.service.IGTeamProcessService;
+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 GTeamProcessServiceImpl extends ServicePlusImpl<GTeamProcessMapper, GTeamProcess, GTeamProcessVo> implements IGTeamProcessService {
+
+    @Override
+    public GTeamProcessVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GTeamProcessVo> queryPageList(GTeamProcessBo bo) {
+        PagePlus<GTeamProcess, GTeamProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GTeamProcessVo> queryList(GTeamProcessBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GTeamProcess> buildQueryWrapper(GTeamProcessBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GTeamProcess> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEmrId() != null, GTeamProcess::getEmrId, bo.getEmrId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GTeamProcess::getProcessStatus, bo.getProcessStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessComments()), GTeamProcess::getProcessComments, bo.getProcessComments());
+        lqw.eq(StringUtils.isNotBlank(bo.getUserPost()), GTeamProcess::getUserPost, bo.getUserPost());
+        lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GTeamProcess::getRemarks, bo.getRemarks());
+        lqw.last("order by create_time desc");
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GTeamProcessBo bo) {
+        GTeamProcess add = BeanUtil.toBean(bo, GTeamProcess.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GTeamProcessBo bo) {
+        GTeamProcess update = BeanUtil.toBean(bo, GTeamProcess.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GTeamProcess 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

@@ -53,8 +53,6 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
 
             GValveWellInspection valveWellInspection = new GValveWellInspection();
             valveWellInspection.setId(item);
-//            gCourtyardNetworkManagement.setProcessStatus(bo.getProcessStatus());
-//            gCourtyardNetworkManagement.setProcessComments(bo.getRemarks());
 
             GValvewellInspectionProcess processBo = new GValvewellInspectionProcess();
             processBo.setEmrId(item);
@@ -66,7 +64,6 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
             boxList.add(valveWellInspection);
         });
         boolean b = valvewellInspectionProcessService.saveBatch(processList);
-//        boolean b = updateBatchById(boxList);
         //更新主表状态
         updateNetworkManage(boxList);
         return b;
@@ -75,14 +72,30 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
     //    @Async
     public void updateNetworkManage(Collection<GValveWellInspection> boxList) {
         boxList.stream().forEach(obj->{
-            QueryWrapper<GValvewellInspectionProcess> queryWrapper = new QueryWrapper<GValvewellInspectionProcess>().eq("emr_id", obj.getId());
+            //最新一条
+            QueryWrapper<GValvewellInspectionProcess> queryWrapper = new QueryWrapper<GValvewellInspectionProcess>().eq("emr_id", obj.getId()).orderByDesc("create_time");
             List<GValvewellInspectionProcess> listed = valvewellInspectionProcessService.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);
+            if(!ObjectUtils.isEmpty(listed)) {
+                //队长审核不通过
+                GValvewellInspectionProcess gTeamProcess = listed.get(0);
+                String regex = "^(xx|XX).{2}";
+                if (gTeamProcess.getUserPost().matches(regex)) {
+                    if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("1");
+                        updateById(obj);
+                    }
+                }else {
+                    //处事审核通过 即主表状态通过
+                    if (gTeamProcess.getProcessStatus().equals("0")){
+                        obj.setProcessStatus("0");
+                        updateById(obj);
+                    }
+                    //处事审核不通过
+                    else if (gTeamProcess.getProcessStatus().equals("1")){
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }
+                }
             }
         });
     }
@@ -103,7 +116,7 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
             //按照顺序审核
             //未审核过队长先展示
-            List<GValvewellInspectionProcess> listed = valvewellInspectionProcessService.list(new QueryWrapper<GValvewellInspectionProcess>().eq("emr_id", item.getId()));
+            List<GValvewellInspectionProcess> listed = valvewellInspectionProcessService.list(new QueryWrapper<GValvewellInspectionProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -170,18 +183,6 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
         GValveWellInspection update = BeanUtil.toBean(bo, GValveWellInspection.class);
         validEntityBeforeSave(update);
         List<String> piclist = bo.getPhotoList();
-        //审核-队长-处事，由一步审核变为两步审核
-        if (StringUtils.isNotBlank(bo.getProcessStatus())){
-            GValvewellInspectionProcessBo processBo = new GValvewellInspectionProcessBo();
-            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());
-            valvewellInspectionProcessService.insertByBo(processBo);
-        }
         if (piclist != null) {
             //原有的照片
             List<String> photolist = baseMapper.getPhoto(bo.getId());
@@ -205,16 +206,8 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
                 }
             }
         }
-        update.setProcessStatus(null);
-        boolean b = updateById(update);
-        if (StringUtils.isNotBlank(bo.getProcessStatus())){
-            //更新主表状态
-            Collection<GValveWellInspection> collection = new ArrayList<>();
-            update.setProcessStatus(bo.getProcessStatus());
-            collection.add(update);
-            updateNetworkManage(collection);
-        }
-        return b;
+        update.setProcessStatus("-1");
+        return updateById(update);
     }
 
     /**