版本1.4.1 审批

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

@@ -15,9 +15,12 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.obs.FileUtil;
 import com.ruoyi.gas.domain.bo.BatchReviewBo;
 import com.ruoyi.gas.domain.bo.GCourtyardNetworkManagementBo;
+import com.ruoyi.gas.domain.bo.GValvewellInspectionProcessBo;
 import com.ruoyi.gas.domain.bo.zipFileBo;
 import com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo;
+import com.ruoyi.gas.domain.vo.GValvewellInspectionProcessVo;
 import com.ruoyi.gas.service.IGCourtyardNetworkManagementService;
+import com.ruoyi.gas.service.IGValvewellInspectionProcessService;
 import com.ruoyi.gas.utils.FileInstallUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,14 +52,26 @@ import java.util.List;
 public class GCourtyardNetworkManagementController extends BaseController {
 
     private final IGCourtyardNetworkManagementService iGCourtyardNetworkManagementService;
+    private final IGValvewellInspectionProcessService processService;
    @Resource
     private  FileInstallUtils fileInstallUtils;
-    // 批量审核
+
+    /**
+     * 批量审核
+     */
     @PostMapping("batchReview")
     public AjaxResult<Void> batchReview(@RequestBody BatchReviewBo bo) {
         return toAjax(iGCourtyardNetworkManagementService.batchReview(bo));
     }
     /**
+     * 查询审核明细
+     */
+    @GetMapping("/reviewList")
+    public TableDataInfo<GValvewellInspectionProcessVo> reviewList(@Validated(QueryGroup.class) GValvewellInspectionProcessBo bo) {
+        return processService.queryPageList(bo);
+    }
+
+    /**
      * 查询庭院网管列表
      */
     @ApiOperation("查询庭院网管列表")

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GCourtyardProcess.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_courtyard_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_courtyard_process")
+public class GCourtyardProcess 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/GMaintenanceProcess.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_maintenance_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_maintenance_process")
+public class GMaintenanceProcess 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/GRegulatorBoxProcess.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_regulator_box_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_regulator_box_process")
+public class GRegulatorBoxProcess 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/GValvewellInspectionProcess.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_valvewell_inspection_process
+ *
+ * @author ruoyi
+ * @date 2024-05-22
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_valvewell_inspection_process")
+public class GValvewellInspectionProcess 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/BatchReviewBo.java

@@ -10,5 +10,7 @@ public class BatchReviewBo {
     private List<Long> uids;
     private String processStatus;
     private String remarks;
+    //岗位
+    private String postNameArias;
 
 }

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

@@ -28,6 +28,10 @@ public class GCourtyardNetworkManagementBo extends BaseEntity {
     private String ranks;
     private String areaName;
     private String areaId;
+
+    //岗位
+    private String postNameArias;
+
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GCourtyardProcessBo.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_courtyard_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("庭院网管巡查审核业务对象")
+public class GCourtyardProcessBo 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/GMaintenanceProcessBo.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_maintenance_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("调压箱维护审核业务对象")
+public class GMaintenanceProcessBo 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/GRegulatingBoxMaintenanceBo.java

@@ -27,6 +27,8 @@ public class GRegulatingBoxMaintenanceBo extends BaseEntity {
     private String ranks;
     private String processStatus;
     private List<Long> uids;
+    //岗位
+    private String postNameArias;
     /**
      * 时间范围查询
      */

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

@@ -25,6 +25,7 @@ import java.util.List;
 public class GRegulatorBoxBo extends BaseEntity {
 
     private List<String> photoList;
+    private String postNameArias;
     /**
      * 主键
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxProcessBo.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_regulator_box_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("调压箱巡查审核业务对象")
+public class GRegulatorBoxProcessBo 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

@@ -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_valvewell_inspection_process
+ *
+ * @author ruoyi
+ * @date 2024-05-22
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("阀井巡查审核业务对象")
+public class GValvewellInspectionProcessBo 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/GCourtyardNetworkManagementVo.java

@@ -5,6 +5,7 @@ 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 com.ruoyi.gas.domain.GValvewellInspectionProcess;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,7 +33,10 @@ public class GCourtyardNetworkManagementVo extends BaseEntity {
 	private List<String> photoList;
 	private String processStatus;
 	private String processComments;
-    /**
+
+	private Boolean flag;
+
+	/**
      * 主键id
      */
 	@ExcelProperty(value = "主键id")

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

@@ -0,0 +1,70 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 庭院网管巡查审核视图对象 g_courtyard_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+@Data
+@ApiModel("庭院网管巡查审核视图对象")
+@ExcelIgnoreUnannotated
+public class GCourtyardProcessVo {
+
+	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/domain/vo/GMaintenanceProcessVo.java

@@ -0,0 +1,70 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 调压箱维护审核视图对象 g_maintenance_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+@Data
+@ApiModel("调压箱维护审核视图对象")
+@ExcelIgnoreUnannotated
+public class GMaintenanceProcessVo {
+
+	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/domain/vo/GRegulatingBoxMaintenanceVo.java

@@ -28,6 +28,7 @@ public class GRegulatingBoxMaintenanceVo extends BaseEntity {
 	private List<String> photoList;
 	private String createByName;
 	private Long parentId;
+	private Boolean flag;
     /**
      * 主键
      */

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

@@ -0,0 +1,70 @@
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 调压箱巡查审核视图对象 g_regulator_box_process
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+@Data
+@ApiModel("调压箱巡查审核视图对象")
+@ExcelIgnoreUnannotated
+public class GRegulatorBoxProcessVo {
+
+	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/domain/vo/GRegulatorBoxVo.java

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

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GValvewellInspectionProcessVo.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_valvewell_inspection_process
+ *
+ * @author ruoyi
+ * @date 2024-05-22
+ */
+@Data
+@ApiModel("阀井巡查审核视图对象")
+@ExcelIgnoreUnannotated
+public class GValvewellInspectionProcessVo 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/GCourtyardProcessMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GCourtyardProcess;
+
+/**
+ * 庭院网管巡查审核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+public interface GCourtyardProcessMapper extends BaseMapperPlus<GCourtyardProcess> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GMaintenanceProcess;
+
+/**
+ * 调压箱维护审核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+public interface GMaintenanceProcessMapper extends BaseMapperPlus<GMaintenanceProcess> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GRegulatorBoxProcess;
+
+/**
+ * 调压箱巡查审核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+public interface GRegulatorBoxProcessMapper extends BaseMapperPlus<GRegulatorBoxProcess> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.gas.mapper;
+
+
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GValvewellInspectionProcess;
+
+/**
+ * 阀井巡查审核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-22
+ */
+public interface GValvewellInspectionProcessMapper extends BaseMapperPlus<GValvewellInspectionProcess> {
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGCourtyardProcessService.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.GCourtyardProcess;
+import com.ruoyi.gas.domain.bo.GCourtyardProcessBo;
+import com.ruoyi.gas.domain.vo.GCourtyardProcessVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 庭院网管巡查审核Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+public interface IGCourtyardProcessService extends IServicePlus<GCourtyardProcess, GCourtyardProcessVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GCourtyardProcessVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GCourtyardProcessVo> queryPageList(GCourtyardProcessBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GCourtyardProcessVo> queryList(GCourtyardProcessBo bo);
+
+	/**
+	 * 根据新增业务对象插入庭院网管巡查审核
+	 * @param bo 庭院网管巡查审核新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GCourtyardProcessBo bo);
+
+	/**
+	 * 根据编辑业务对象修改庭院网管巡查审核
+	 * @param bo 庭院网管巡查审核编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GCourtyardProcessBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGMaintenanceProcessService.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.GMaintenanceProcess;
+import com.ruoyi.gas.domain.bo.GMaintenanceProcessBo;
+import com.ruoyi.gas.domain.vo.GMaintenanceProcessVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 调压箱维护审核Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-23
+ */
+public interface IGMaintenanceProcessService extends IServicePlus<GMaintenanceProcess, GMaintenanceProcessVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GMaintenanceProcessVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GMaintenanceProcessVo> queryPageList(GMaintenanceProcessBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GMaintenanceProcessVo> queryList(GMaintenanceProcessBo bo);
+
+	/**
+	 * 根据新增业务对象插入调压箱维护审核
+	 * @param bo 调压箱维护审核新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GMaintenanceProcessBo bo);
+
+	/**
+	 * 根据编辑业务对象修改调压箱维护审核
+	 * @param bo 调压箱维护审核编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GMaintenanceProcessBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

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

@@ -0,0 +1,57 @@
+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.GValvewellInspectionProcess;
+import com.ruoyi.gas.domain.bo.GValvewellInspectionProcessBo;
+import com.ruoyi.gas.domain.vo.GValvewellInspectionProcessVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 阀井巡查审核Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-22
+ */
+public interface IGValvewellInspectionProcessService extends IServicePlus<GValvewellInspectionProcess, GValvewellInspectionProcessVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GValvewellInspectionProcessVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GValvewellInspectionProcessVo> queryPageList(GValvewellInspectionProcessBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GValvewellInspectionProcessVo> queryList(GValvewellInspectionProcessBo bo);
+
+	/**
+	 * 根据新增业务对象插入阀井巡查审核
+	 * @param bo 阀井巡查审核新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GValvewellInspectionProcessBo bo);
+
+	/**
+	 * 根据编辑业务对象修改阀井巡查审核
+	 * @param bo 阀井巡查审核编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GValvewellInspectionProcessBo 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

@@ -2,6 +2,7 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@@ -9,16 +10,19 @@ 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.bo.BatchReviewBo;
-import com.ruoyi.gas.domain.bo.GCourtyardNetworkManagementBo;
-import com.ruoyi.gas.domain.bo.GNetworkManagementPhotoBo;
-import com.ruoyi.gas.domain.bo.zipFileBo;
+import com.ruoyi.gas.domain.GCourtyardProcess;
+import com.ruoyi.gas.domain.GValvewellInspectionProcess;
+import com.ruoyi.gas.domain.bo.*;
 import com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo;
 import com.ruoyi.gas.mapper.GCourtyardNetworkManagementMapper;
 import com.ruoyi.gas.service.IGCourtyardNetworkManagementService;
+import com.ruoyi.gas.service.IGCourtyardProcessService;
 import com.ruoyi.gas.service.IGNetworkManagementPhotoService;
+import com.ruoyi.gas.service.IGValvewellInspectionProcessService;
 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.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -36,18 +40,56 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
 
     @Autowired
     private IGNetworkManagementPhotoService igNetworkManagementPhotoService;
+    @Autowired
+    private IGCourtyardProcessService igCourtyardProcessService;
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean batchReview(BatchReviewBo bo) {
         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.setRemarks(bo.getRemarks());
+//            gCourtyardNetworkManagement.setProcessStatus(bo.getProcessStatus());
+//            gCourtyardNetworkManagement.setProcessComments(bo.getRemarks());
+
+            GCourtyardProcess processBo = new GCourtyardProcess();
+            processBo.setEmrId(item);
+            processBo.setProcessStatus(bo.getProcessStatus());
+            processBo.setProcessComments(bo.getRemarks());
+            processBo.setUserPost(bo.getPostNameArias());
+            processList.add(processBo);
             boxList.add(gCourtyardNetworkManagement);
         });
-        return updateBatchById(boxList);
+        boolean b = igCourtyardProcessService.saveBatch(processList);
+//        boolean b = updateBatchById(boxList);
+        //更新主表状态
+        updateNetworkManage(boxList);
+        return b;
+    }
+
+//    @Async
+    public void updateNetworkManage(Collection<GCourtyardNetworkManagement> boxList) {
+        Collection<GCourtyardNetworkManagement> todoList = new ArrayList<>();
+        boxList.stream().forEach(obj->{
+            QueryWrapper<GCourtyardProcess> queryWrapper = new QueryWrapper<GCourtyardProcess>().eq("emr_id", obj.getId());
+            List<GCourtyardProcess> listed = igCourtyardProcessService.list(queryWrapper);
+            if (listed.stream().filter(o->o.getProcessStatus().equals("0")).count()==2) {
+                obj.setProcessStatus("0");
+                todoList.add(obj);
+            }else if (listed.stream().anyMatch(o -> o.getProcessStatus().equals("1"))) {
+                obj.setProcessStatus("1");
+                todoList.add(obj);
+            }
+        });
+        if (!ObjectUtils.isEmpty(todoList)){
+            updateBatchById(todoList);
+        }
     }
+
+
     @Override
     public GCourtyardNetworkManagementVo queryById(Long id){
         GCourtyardNetworkManagementVo byId = baseMapper.getById(id);
@@ -59,7 +101,29 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
     public TableDataInfo<GCourtyardNetworkManagementVo> queryPageList(GCourtyardNetworkManagementBo bo) {
         Page<GCourtyardNetworkManagementVo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         Page<GCourtyardNetworkManagementVo> list = baseMapper.getList(bo, page);
-        list.getRecords().forEach(item -> item.setPhotoList(baseMapper.getPhoto(item.getId())));
+        list.getRecords().forEach(item -> {
+            item.setPhotoList(baseMapper.getPhoto(item.getId()));
+            //按照顺序审核
+            //未审核过队长先展示
+            List<GCourtyardProcess> listed = igCourtyardProcessService.list(new QueryWrapper<GCourtyardProcess>().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 PageUtils.buildDataInfo(list);
     }
 
@@ -127,10 +191,20 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(GCourtyardNetworkManagementBo bo) {
         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());
+            igCourtyardProcessService.insertByBo(processBo);
+        }
         if (piclist != null) {
             //原有的照片
             List<String> photolist = baseMapper.getPhoto(bo.getId());
@@ -154,7 +228,16 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
                 }
             }
         }
-        return updateById(update);
+        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;
     }
 
     /**

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

@@ -0,0 +1,92 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.gas.domain.GCourtyardProcess;
+import com.ruoyi.gas.domain.bo.GCourtyardProcessBo;
+import com.ruoyi.gas.domain.vo.GCourtyardProcessVo;
+import com.ruoyi.gas.mapper.GCourtyardProcessMapper;
+import com.ruoyi.gas.service.IGCourtyardProcessService;
+import org.springframework.stereotype.Service;
+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-23
+ */
+@Service
+public class GCourtyardProcessServiceImpl extends ServicePlusImpl<GCourtyardProcessMapper, GCourtyardProcess, GCourtyardProcessVo> implements IGCourtyardProcessService {
+
+    @Override
+    public GCourtyardProcessVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GCourtyardProcessVo> queryPageList(GCourtyardProcessBo bo) {
+        PagePlus<GCourtyardProcess, GCourtyardProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GCourtyardProcessVo> queryList(GCourtyardProcessBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GCourtyardProcess> buildQueryWrapper(GCourtyardProcessBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GCourtyardProcess> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEmrId() != null, GCourtyardProcess::getEmrId, bo.getEmrId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GCourtyardProcess::getProcessStatus, bo.getProcessStatus());
+        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());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GCourtyardProcessBo bo) {
+        GCourtyardProcess add = BeanUtil.toBean(bo, GCourtyardProcess.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GCourtyardProcessBo bo) {
+        GCourtyardProcess update = BeanUtil.toBean(bo, GCourtyardProcess.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GCourtyardProcess 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/GMaintenanceProcessServiceImpl.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.GMaintenanceProcess;
+import com.ruoyi.gas.domain.bo.GMaintenanceProcessBo;
+import com.ruoyi.gas.domain.vo.GMaintenanceProcessVo;
+import com.ruoyi.gas.mapper.GMaintenanceProcessMapper;
+import com.ruoyi.gas.service.IGMaintenanceProcessService;
+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-23
+ */
+@Service
+public class GMaintenanceProcessServiceImpl extends ServicePlusImpl<GMaintenanceProcessMapper, GMaintenanceProcess, GMaintenanceProcessVo> implements IGMaintenanceProcessService {
+
+    @Override
+    public GMaintenanceProcessVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GMaintenanceProcessVo> queryPageList(GMaintenanceProcessBo bo) {
+        PagePlus<GMaintenanceProcess, GMaintenanceProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GMaintenanceProcessVo> queryList(GMaintenanceProcessBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GMaintenanceProcess> buildQueryWrapper(GMaintenanceProcessBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GMaintenanceProcess> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEmrId() != null, GMaintenanceProcess::getEmrId, bo.getEmrId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GMaintenanceProcess::getProcessStatus, bo.getProcessStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessComments()), GMaintenanceProcess::getProcessComments, bo.getProcessComments());
+        lqw.eq(StringUtils.isNotBlank(bo.getUserPost()), GMaintenanceProcess::getUserPost, bo.getUserPost());
+        lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GMaintenanceProcess::getRemarks, bo.getRemarks());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GMaintenanceProcessBo bo) {
+        GMaintenanceProcess add = BeanUtil.toBean(bo, GMaintenanceProcess.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GMaintenanceProcessBo bo) {
+        GMaintenanceProcess update = BeanUtil.toBean(bo, GMaintenanceProcess.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GMaintenanceProcess 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/GRegulatingBoxMaintenanceServiceImpl.java

@@ -2,24 +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.GPressureRegulatingBox;
-import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
-import com.ruoyi.gas.domain.bo.BatchReviewBo;
-import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
-import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenancePhotoBo;
+import com.ruoyi.gas.domain.*;
+import com.ruoyi.gas.domain.bo.*;
 import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
 import com.ruoyi.gas.mapper.GRegulatingBoxMaintenanceMapper;
+import com.ruoyi.gas.service.IGMaintenanceProcessService;
 import com.ruoyi.gas.service.IGRegulatingBoxMaintenancePhotoService;
 import com.ruoyi.gas.service.IGRegulatingBoxMaintenanceService;
 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.*;
@@ -33,18 +33,52 @@ import java.util.stream.Collectors;
  */
 @Service
 public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegulatingBoxMaintenanceMapper, GRegulatingBoxMaintenance, GRegulatingBoxMaintenanceVo> implements IGRegulatingBoxMaintenanceService {
-
+    @Autowired
+    private IGMaintenanceProcessService igMaintenanceProcessService;
     @Override
+    @Transactional(rollbackFor = Exception.class)
     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());
+//            gRegulatingBoxMaintenance.setProcessStatus(bo.getProcessStatus());
+//            gRegulatingBoxMaintenance.setRemarks(bo.getRemarks());
             gRegulatingBoxMaintenances.add(gRegulatingBoxMaintenance);
+
+            GMaintenanceProcess processBo = new GMaintenanceProcess();
+            processBo.setEmrId(item);
+            processBo.setProcessStatus(bo.getProcessStatus());
+            processBo.setProcessComments(bo.getRemarks());
+            processBo.setUserPost(bo.getPostNameArias());
+
+            processList.add(processBo);
         });
-        return updateBatchById(gRegulatingBoxMaintenances);
+        boolean b = igMaintenanceProcessService.saveBatch(processList);
+//        boolean b = updateBatchById(gRegulatingBoxMaintenances);
+        //更新主表状态
+        updateNetworkManage(gRegulatingBoxMaintenances);
+        return b;
+    }
+
+    private void updateNetworkManage(Collection<GRegulatingBoxMaintenance> gRegulatingBoxMaintenances) {
+        Collection<GRegulatingBoxMaintenance> todoList = new ArrayList<>();
+        gRegulatingBoxMaintenances.stream().forEach(obj->{
+            QueryWrapper<GMaintenanceProcess> queryWrapper = new QueryWrapper<GMaintenanceProcess>().eq("emr_id", obj.getId());
+            List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(queryWrapper);
+            if (listed.stream().filter(o->o.getProcessStatus().equals("0")).count()==2) {
+                obj.setProcessStatus("0");
+                todoList.add(obj);
+            }else if (listed.stream().anyMatch(o -> o.getProcessStatus().equals("1"))) {
+                obj.setProcessStatus("1");
+                todoList.add(obj);
+            }
+        });
+        if (!ObjectUtils.isEmpty(todoList)){
+            updateBatchById(todoList);
+        }
     }
 
     @Override
@@ -69,6 +103,27 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
         result.getRecordsVo().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
             item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+
+            //按照顺序审核
+            //未审核过队长先展示
+            List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(new QueryWrapper<GMaintenanceProcess>().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 PageUtils.buildDataInfo(result);
     }
@@ -122,10 +177,20 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(GRegulatingBoxMaintenanceBo bo) {
         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());
@@ -149,7 +214,16 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
                 }
             }
         }
-        return updateById(update);
+        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;
     }
 
     /**

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxProcessServiceImpl.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.GRegulatorBoxProcess;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxProcessBo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxProcessVo;
+import com.ruoyi.gas.mapper.GRegulatorBoxProcessMapper;
+import com.ruoyi.gas.service.IGRegulatorBoxProcessService;
+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-23
+ */
+@Service
+public class GRegulatorBoxProcessServiceImpl extends ServicePlusImpl<GRegulatorBoxProcessMapper, GRegulatorBoxProcess, GRegulatorBoxProcessVo> implements IGRegulatorBoxProcessService {
+
+    @Override
+    public GRegulatorBoxProcessVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GRegulatorBoxProcessVo> queryPageList(GRegulatorBoxProcessBo bo) {
+        PagePlus<GRegulatorBoxProcess, GRegulatorBoxProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GRegulatorBoxProcessVo> queryList(GRegulatorBoxProcessBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GRegulatorBoxProcess> buildQueryWrapper(GRegulatorBoxProcessBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GRegulatorBoxProcess> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEmrId() != null, GRegulatorBoxProcess::getEmrId, bo.getEmrId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GRegulatorBoxProcess::getProcessStatus, bo.getProcessStatus());
+        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());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GRegulatorBoxProcessBo bo) {
+        GRegulatorBoxProcess add = BeanUtil.toBean(bo, GRegulatorBoxProcess.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GRegulatorBoxProcessBo bo) {
+        GRegulatorBoxProcess update = BeanUtil.toBean(bo, GRegulatorBoxProcess.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GRegulatorBoxProcess 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/GRegulatorBoxServiceImpl.java

@@ -2,24 +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.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
-import com.ruoyi.gas.domain.bo.GRegulatorBoxPhotoBo;
+import com.ruoyi.gas.domain.*;
+import com.ruoyi.gas.domain.bo.*;
 import com.ruoyi.gas.domain.vo.GCensusVo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
 import com.ruoyi.gas.mapper.GRegulatorBoxMapper;
 import com.ruoyi.gas.service.IGRegulatorBoxPhotoService;
+import com.ruoyi.gas.service.IGRegulatorBoxProcessService;
 import com.ruoyi.gas.service.IGRegulatorBoxService;
 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.ArrayList;
@@ -40,18 +40,55 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
 
     @Autowired
     private IGRegulatorBoxPhotoService igRegulatorBoxPhotoService;
+
+    @Autowired
+    private IGRegulatorBoxProcessService igRegulatorBoxProcessService;
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean batchReview(BatchReviewBo bo) {
         Collection<GRegulatorBox> boxList = new ArrayList<>();
+        Collection<GRegulatorBoxProcess> processList = new ArrayList<>();
+
         bo.getUids().forEach(item -> {
             GRegulatorBox box = new GRegulatorBox();
             box.setId(item);
-            box.setProcessStatus(bo.getProcessStatus());
-            box.setRemarks(bo.getRemarks());
+//            box.setProcessStatus(bo.getProcessStatus());
+//            box.setRemarks(bo.getRemarks());
             boxList.add(box);
+
+            GRegulatorBoxProcess processBo = new GRegulatorBoxProcess();
+            processBo.setEmrId(item);
+            processBo.setProcessStatus(bo.getProcessStatus());
+            processBo.setProcessComments(bo.getRemarks());
+            processBo.setUserPost(bo.getPostNameArias());
+            processList.add(processBo);
+        });
+        boolean b = igRegulatorBoxProcessService.saveBatch(processList);
+//        boolean b = updateBatchById(boxList);
+        //更新主表状态
+        updateNetworkManage(boxList);
+        return b;
+    }
+
+    public void updateNetworkManage(Collection<GRegulatorBox> boxList) {
+        Collection<GRegulatorBox> todoList = new ArrayList<>();
+        boxList.stream().forEach(obj->{
+            QueryWrapper<GRegulatorBoxProcess> queryWrapper = new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", obj.getId());
+            List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.list(queryWrapper);
+            if (listed.stream().filter(o->o.getProcessStatus().equals("0")).count()==2) {
+                obj.setProcessStatus("0");
+                todoList.add(obj);
+            }else if (listed.stream().anyMatch(o -> o.getProcessStatus().equals("1"))) {
+                obj.setProcessStatus("1");
+                todoList.add(obj);
+            }
         });
-        return updateBatchById(boxList);
+        if (!ObjectUtils.isEmpty(todoList)){
+            updateBatchById(todoList);
+        }
     }
+
     @Override
     public GRegulatorBoxVo queryById(Long id) {
         GRegulatorBoxVo byId = baseMapper.getById(id);
@@ -63,7 +100,29 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
     public TableDataInfo<GRegulatorBoxVo> queryPageList(GRegulatorBoxBo bo) {
         Page<GRegulatorBoxBo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         Page<GRegulatorBoxVo> result = baseMapper.getList(bo, page);
-        result.getRecords().forEach(item -> item.setPhotoList(baseMapper.getPhoto(item.getId())));
+        result.getRecords().forEach(item -> {
+            item.setPhotoList(baseMapper.getPhoto(item.getId()));
+            //按照顺序审核
+            //未审核过队长先展示
+            List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.list(new QueryWrapper<GRegulatorBoxProcess>().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 PageUtils.buildDataInfo(result);
     }
 
@@ -144,10 +203,20 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(GRegulatorBoxBo bo) {
         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.getRemark());
+            processBo.setUserPost(bo.getPostNameArias());
+            igRegulatorBoxProcessService.insertByBo(processBo);
+        }
         if (piclist != null) {
             //原有的照片
             List<String> photolist = baseMapper.getPhoto(bo.getId());
@@ -171,7 +240,16 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
                 }
             }
         }
-        return updateById(update);
+        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;
     }
 
     /**

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

@@ -18,6 +18,7 @@ import com.ruoyi.gas.mapper.GValveWellInspectionMapper;
 import com.ruoyi.gas.mapper.GValveWellPositionMapper;
 import com.ruoyi.gas.service.IGValveWellInspectionPhotoService;
 import com.ruoyi.gas.service.IGValveWellInspectionService;
+import com.ruoyi.gas.service.IGValvewellInspectionProcessService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -38,7 +39,6 @@ import java.util.stream.Collectors;
 public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellInspectionMapper, GValveWellInspection, GValveWellInspectionVo> implements IGValveWellInspectionService {
 
     private final GValveWellPositionMapper  positionMapper;
-
     @Override
     public GValveWellInspectionVo queryById(Long id){
         GValveWellInspectionVo voById = getVoById(id);

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

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