版本1.4.1 审核修改

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

@@ -11,10 +11,7 @@ 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.GRegulatorBoxProcess;
-import com.ruoyi.gas.domain.bo.BatchReviewBo;
-import com.ruoyi.gas.domain.bo.GCourtyardProcessBo;
-import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
-import com.ruoyi.gas.domain.bo.GRegulatorBoxProcessBo;
+import com.ruoyi.gas.domain.bo.*;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
 import com.ruoyi.gas.service.IGRegulatorBoxProcessService;
 import com.ruoyi.gas.service.IGRegulatorBoxService;
@@ -66,6 +63,8 @@ public class GRegulatorBoxController extends BaseController {
         return processService.queryPageList(bo);
     }
 
+
+
     /**
      * 查询调压箱管理列表
      */

ruoyi-admin/src/main/resources/application-dev.yml

@@ -57,7 +57,7 @@ spring:
 #          url: jdbc:mysql://123.249.30.140:3307/gas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
 #          username: root
 #          password: szrqwx123456
-          url: jdbc:mysql://49.232.253.249:3306/zdsz_xx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://49.232.253.249:3306/zdsz_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: Lanyuxinxi@88.com
 #          url: jdbc:mysql://121.37.40.217:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true

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

@@ -0,0 +1,79 @@
+package com.ruoyi.gas.controller;
+
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GRegulatorBoxRelation;
+import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo;
+import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
+import com.ruoyi.gas.service.IGPressureRegulatingBoxService;
+import com.ruoyi.gas.service.IGRegulatorBoxRelationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+import java.util.function.Function;
+
+/**
+ * 巡检车队Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/common")
+public class GCommonController extends BaseController {
+
+    @Autowired
+    private IGPressureRegulatingBoxService pressureRegulatingBoxService;
+    @Autowired
+    private IGRegulatorBoxRelationService regulatorBoxRelationService;
+
+    /**
+     * 洗数据
+     */
+    @GetMapping("/refresh")
+    public AjaxResult refresh() {
+        GPressureRegulatingBoxBo gPressureRegulatingBoxBo = new GPressureRegulatingBoxBo();
+        //查询所有
+        List<GPressureRegulatingBoxVo> list = pressureRegulatingBoxService.queryList(gPressureRegulatingBoxBo);
+        List<GRegulatorBoxRelation> relations = new ArrayList<>();
+        list.forEach(item->{
+            if (StringUtils.isNotBlank(item.getInspector())){
+                List<String> inspectors = Arrays.asList(item.getInspector().split(","));
+                Long boxId = item.getId();
+                String createBy = item.getCreateBy();
+                Date createTime = item.getCreateTime();
+                if (!ObjectUtils.isEmpty(inspectors)){
+                    inspectors.forEach(o->{
+                        GRegulatorBoxRelation entity = new GRegulatorBoxRelation();
+                        entity.setRegulatorBoxId(boxId);
+                        entity.setUserId(o);
+                        entity.setCreateBy(o);
+                        entity.setCreateTime(createTime);
+                        relations.add(entity);
+                    });
+                }
+            }
+        });
+        if (!ObjectUtils.isEmpty(relations)){
+            regulatorBoxRelationService.saveBatch(relations);
+        }
+        return null;
+    }
+
+    /**
+     * 我的
+     */
+    @GetMapping("/myData")
+    public AjaxResult myData() {
+        Function<Map<String,Object>, AjaxResult<List<Object>>> function;
+        return null;
+    }
+}

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

@@ -12,7 +12,9 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.GPressureRegulatingBox;
 import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxExcelVo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
 import com.ruoyi.gas.service.IGPressureRegulatingBoxDetailsService;
@@ -57,7 +59,13 @@ public class GPressureRegulatingBoxController extends BaseController {
     }
     @Autowired
     private IGPressureRegulatingBoxDetailsService pressureRegulatingBoxDetailsService;
-
+    /**
+     * 查询我的调压箱
+     */
+    @GetMapping("/myList")
+    public TableDataInfo myList(@Validated(QueryGroup.class) GPressureRegulatingBoxBo bo) {
+        return iGPressureRegulatingBoxService.myList(bo);
+    }
     /**
      * 导出调压箱管理列表
      */

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

@@ -0,0 +1,113 @@
+package com.ruoyi.gas.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import com.ruoyi.gas.domain.bo.GRegulatorBoxRelationBo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxRelationVo;
+import com.ruoyi.gas.service.IGRegulatorBoxRelationService;
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 调压箱目录中间Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Validated
+@Api(value = "调压箱目录中间控制器", tags = {"调压箱目录中间管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/regulatorBoxRelation")
+public class GRegulatorBoxRelationController extends BaseController {
+
+    private final IGRegulatorBoxRelationService iGRegulatorBoxRelationService;
+
+    /**
+     * 查询调压箱目录中间列表
+     */
+    @ApiOperation("查询调压箱目录中间列表")
+//    @PreAuthorize("@ss.hasPermi('gas:regulatorBoxRelation:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GRegulatorBoxRelationVo> list(@Validated(QueryGroup.class) GRegulatorBoxRelationBo bo) {
+        return iGRegulatorBoxRelationService.queryPageList(bo);
+    }
+
+    /**
+     * 导出调压箱目录中间列表
+     */
+    @ApiOperation("导出调压箱目录中间列表")
+//    @PreAuthorize("@ss.hasPermi('gas:regulatorBoxRelation:export')")
+    @Log(title = "调压箱目录中间", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GRegulatorBoxRelationBo bo, HttpServletResponse response) {
+        List<GRegulatorBoxRelationVo> list = iGRegulatorBoxRelationService.queryList(bo);
+        ExcelUtil.exportExcel(list, "调压箱目录中间", GRegulatorBoxRelationVo.class, response);
+    }
+
+    /**
+     * 获取调压箱目录中间详细信息
+     */
+    @ApiOperation("获取调压箱目录中间详细信息")
+//    @PreAuthorize("@ss.hasPermi('gas:regulatorBoxRelation:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GRegulatorBoxRelationVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGRegulatorBoxRelationService.queryById(id));
+    }
+
+    /**
+     * 新增调压箱目录中间
+     */
+    @ApiOperation("新增调压箱目录中间")
+//    @PreAuthorize("@ss.hasPermi('gas:regulatorBoxRelation:add')")
+    @Log(title = "调压箱目录中间", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GRegulatorBoxRelationBo bo) {
+        return toAjax(iGRegulatorBoxRelationService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改调压箱目录中间
+     */
+    @ApiOperation("修改调压箱目录中间")
+//    @PreAuthorize("@ss.hasPermi('gas:regulatorBoxRelation:edit')")
+    @Log(title = "调压箱目录中间", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GRegulatorBoxRelationBo bo) {
+        return toAjax(iGRegulatorBoxRelationService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除调压箱目录中间
+     */
+    @ApiOperation("删除调压箱目录中间")
+//    @PreAuthorize("@ss.hasPermi('gas:regulatorBoxRelation:remove')")
+    @Log(title = "调压箱目录中间" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGRegulatorBoxRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

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

@@ -170,10 +170,6 @@ public class GRegulatorBox extends BaseEntity {
      */
     private String valveWellCondition;
     /**
-     * 备注
-     */
-    private String remark;
-    /**
      * 删除标志
      */
     @TableLogic

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

@@ -0,0 +1,45 @@
+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_relation
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_regulator_box_relation")
+public class GRegulatorBoxRelation extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 关联人员
+     */
+    private String userId;
+    /**
+     * 关联调压箱目录
+     */
+    private Long regulatorBoxId;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -24,7 +24,8 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel("调压箱管理业务对象")
 public class GPressureRegulatingBoxBo extends BaseEntity {
-
+    //我的调压箱
+    private String jobNum;
     /**
      * 序号
      */

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

@@ -26,6 +26,9 @@ public class GRegulatorBoxBo extends BaseEntity {
 
     private List<String> photoList;
     private String postNameArias;
+
+
+
     /**
      * 主键
      */

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

@@ -0,0 +1,74 @@
+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 java.util.List;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 调压箱目录中间业务对象 g_regulator_box_relation
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("调压箱目录中间业务对象")
+public class GRegulatorBoxRelationBo extends BaseEntity {
+
+    /**
+     * 
+     */
+    @ApiModelProperty(value = "", required = true)
+    private Long id;
+
+    private List<Long> ids;
+    private String jobNum;
+
+    /**
+     * 关联人员
+     */
+    @ApiModelProperty(value = "关联人员", required = true)
+    private Long userId;
+
+    /**
+     * 关联调压箱目录
+     */
+    @ApiModelProperty(value = "关联调压箱目录", required = true)
+    private Long regulatorBoxId;
+
+
+    /**
+     * 分页大小
+     */
+    @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/GCourtyardProcessVo.java

@@ -24,7 +24,7 @@ import java.util.Date;
 public class GCourtyardProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
-
+	private String createName;
     /**
      * 
      */

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

@@ -24,7 +24,7 @@ import java.util.Date;
 public class GMaintenanceProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
-
+	private String createName;
     /**
      * 
      */

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

@@ -2,6 +2,7 @@ package com.ruoyi.gas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +19,7 @@ import java.util.List;
 @Data
 @ApiModel("调压箱管理视图对象")
 @ExcelIgnoreUnannotated
-public class GPressureRegulatingBoxVo {
+public class GPressureRegulatingBoxVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 

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

@@ -24,7 +24,7 @@ import java.util.Date;
 public class GRegulatorBoxProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
-
+	private String createName;
     /**
      * 
      */

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

@@ -0,0 +1,49 @@
+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_relation
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Data
+@ApiModel("调压箱目录中间视图对象")
+@ExcelIgnoreUnannotated
+public class GRegulatorBoxRelationVo {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+	@ExcelProperty(value = "")
+	@ApiModelProperty("")
+	private Long id;
+
+    /**
+     * 关联人员
+     */
+	@ExcelProperty(value = "关联人员")
+	@ApiModelProperty("关联人员")
+	private String userId;
+
+    /**
+     * 关联调压箱目录
+     */
+	@ExcelProperty(value = "关联调压箱目录")
+	@ApiModelProperty("关联调压箱目录")
+	private Long regulatorBoxId;
+
+
+}

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

@@ -24,7 +24,7 @@ import java.util.Date;
 public class GRoadsectionProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
-
+	private String createName;
     /**
      * 
      */

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

@@ -24,7 +24,7 @@ import java.util.Date;
 public class GTeamProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
-
+	private String createName;
     /**
      * 
      */

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

@@ -24,7 +24,7 @@ import java.util.Date;
 public class GValvewellInspectionProcessVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
-
+	private String createName;
     /**
      * 
      */

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

@@ -0,0 +1,21 @@
+package com.ruoyi.gas.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GRegulatorBoxRelation;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxRelationBo;
+import com.ruoyi.gas.domain.vo.GCadFileVo;
+import com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxRelationVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 调压箱目录中间Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+public interface GRegulatorBoxRelationMapper extends BaseMapperPlus<GRegulatorBoxRelation> {
+}

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.gas.domain.GPressureRegulatingBox;
 import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxExcelVo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
 
@@ -59,4 +60,6 @@ public interface IGPressureRegulatingBoxService extends IServicePlus<GPressureRe
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	TableDataInfo myList(GPressureRegulatingBoxBo bo);
 }

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

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

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 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.GRegulatorBoxRelationBo;
 import com.ruoyi.gas.domain.vo.GCensusVo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxVo;
 
@@ -58,4 +59,5 @@ public interface IGRegulatorBoxService extends IServicePlus<GRegulatorBox, GRegu
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
 }

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

@@ -77,4 +77,5 @@ public interface IGUserService extends IServicePlus<GUser, GUserVo> {
 	List<GCensusVo> getExamineWorker(Long workerId);
 	Boolean getForPhone(Long phone,String id);
 	Boolean getForJobnum(String jobNum,String id);
+
 }

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

@@ -79,13 +79,17 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
                 String regex = "^(xx|XX).{2}";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
-                        obj.setProcessStatus("1");
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }else if (gTeamProcess.getProcessStatus().equals("0")){
+                        //队长通过 处事没审核
+                        obj.setProcessStatus("0");
                         updateById(obj);
                     }
                 }else {
                     //处事审核通过 即主表状态通过
                     if (gTeamProcess.getProcessStatus().equals("0")){
-                        obj.setProcessStatus("0");
+                        obj.setProcessStatus("1");
                         updateById(obj);
                     }
                     //处事审核不通过
@@ -114,7 +118,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()).eq("process_status","0"));
+            List<GCourtyardProcess> listed = igCourtyardProcessService.list(new QueryWrapper<GCourtyardProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -122,15 +126,21 @@ public class GCourtyardNetworkManagementServiceImpl extends ServicePlusImpl<GCou
                 }
             }
             else {
-                //审核过
-                //该岗位审核过就不显示
-                listed.forEach(o->{
-                    if (o.getUserPost().equals(bo.getPostNameArias())){
-                        item.setFlag(false);
-                    }else {
-                        item.setFlag(true);
+                String regex = "^(xx|XX).{2}";
+                if (bo.getPostNameArias().matches(regex)){
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                }else {
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){
+                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
                     }
-                });
+                }
             }
         });
         return PageUtils.buildDataInfo(list);

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

@@ -2,16 +2,20 @@ package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.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.GUser;
 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 com.ruoyi.gas.service.IGUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
@@ -33,9 +37,17 @@ public class GCourtyardProcessServiceImpl extends ServicePlusImpl<GCourtyardProc
         return getVoById(id);
     }
 
+    @Autowired
+    private IGUserService igUserService;
+
     @Override
     public TableDataInfo<GCourtyardProcessVo> queryPageList(GCourtyardProcessBo bo) {
         PagePlus<GCourtyardProcess, GCourtyardProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item->{
+            QueryWrapper<GUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(GUser::getJobNum,item.getCreateBy());
+            item.setCreateName(igUserService.getOne(queryWrapper)!=null?igUserService.getOne(queryWrapper).getName():"");
+        });
         return PageUtils.buildDataInfo(result);
     }
 

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

@@ -1,15 +1,19 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.GUser;
 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 com.ruoyi.gas.service.IGUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -32,10 +36,16 @@ public class GMaintenanceProcessServiceImpl extends ServicePlusImpl<GMaintenance
     public GMaintenanceProcessVo queryById(Long id){
         return getVoById(id);
     }
-
+    @Autowired
+    private IGUserService igUserService;
     @Override
     public TableDataInfo<GMaintenanceProcessVo> queryPageList(GMaintenanceProcessBo bo) {
         PagePlus<GMaintenanceProcess, GMaintenanceProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item->{
+            QueryWrapper<GUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(GUser::getJobNum,item.getCreateBy());
+            item.setCreateName(igUserService.getOne(queryWrapper)!=null?igUserService.getOne(queryWrapper).getName():"");
+        });
         return PageUtils.buildDataInfo(result);
     }
 

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

@@ -72,13 +72,17 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
                 String regex = "^(xx|XX).{2}";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
-                        obj.setProcessStatus("1");
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }else if (gTeamProcess.getProcessStatus().equals("0")){
+                        //队长通过 处事没审核
+                        obj.setProcessStatus("0");
                         updateById(obj);
                     }
                 }else {
                     //处事审核通过 即主表状态通过
                     if (gTeamProcess.getProcessStatus().equals("0")){
-                        obj.setProcessStatus("0");
+                        obj.setProcessStatus("1");
                         updateById(obj);
                     }
                     //处事审核不通过
@@ -114,7 +118,7 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
 
             //按照顺序审核
             //未审核过队长先展示
-            List<GTeamProcess> listed = teamProcessService.list(new QueryWrapper<GTeamProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
+            List<GTeamProcess> listed = teamProcessService.list(new QueryWrapper<GTeamProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -122,14 +126,21 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
                 }
             }
             else {
-                //该岗位审核过就不显示
-                listed.forEach(o->{
-                    if (o.getUserPost().equals(bo.getPostNameArias())){
-                        item.setFlag(false);
-                    }else {
-                        item.setFlag(true);
+                String regex = "^(xx|XX).{2}";
+                if (bo.getPostNameArias().matches(regex)){
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                }else {
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){
+                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
                     }
-                });
+                }
             }
         });
         return PageUtils.buildDataInfo(result);

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPressureRegulatingBoxServiceImpl.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.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
@@ -10,14 +11,18 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GPressureRegulatingBox;
+import com.ruoyi.gas.domain.GRegulatorBox;
+import com.ruoyi.gas.domain.GRegulatorBoxRelation;
 import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo;
 import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxDetailsBo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxDetailsVo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxExcelVo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
 import com.ruoyi.gas.mapper.GPressureRegulatingBoxMapper;
 import com.ruoyi.gas.service.IGPressureRegulatingBoxDetailsService;
 import com.ruoyi.gas.service.IGPressureRegulatingBoxService;
+import com.ruoyi.gas.service.IGRegulatorBoxRelationService;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,6 +34,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 调压箱管理Service业务层处理
@@ -171,7 +177,8 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
         }
         return lqw;
     }
-
+    @Autowired
+    private IGRegulatorBoxRelationService regulatorBoxRelationService;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(GPressureRegulatingBoxBo bo) {
@@ -210,4 +217,18 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
         }
         return removeByIds(ids);
     }
+
+    @Override
+    public TableDataInfo myList(GPressureRegulatingBoxBo bo) {
+        LambdaQueryWrapper<GPressureRegulatingBox> lqw = Wrappers.lambdaQuery();
+        //查询我的
+        if (StringUtils.isNotBlank(bo.getJobNum())){
+            QueryWrapper<GRegulatorBoxRelation> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(GRegulatorBoxRelation::getUserId,bo.getJobNum());
+            List<Long> collect = regulatorBoxRelationService.list(queryWrapper).stream().map(GRegulatorBoxRelation::getRegulatorBoxId).collect(Collectors.toList());
+            lqw.in(GPressureRegulatingBox::getId,collect);
+        }
+        PagePlus<GPressureRegulatingBox, GPressureRegulatingBoxVo> result = pageVo(PageUtils.buildPagePlus(), lqw);
+        return PageUtils.buildDataInfo(result);
+    }
 }

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

@@ -70,13 +70,17 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
                 String regex = "^(xx|XX).{2}";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
-                        obj.setProcessStatus("1");
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }else if (gTeamProcess.getProcessStatus().equals("0")){
+                        //队长通过 处事没审核
+                        obj.setProcessStatus("0");
                         updateById(obj);
                     }
                 }else {
                     //处事审核通过 即主表状态通过
                     if (gTeamProcess.getProcessStatus().equals("0")){
-                        obj.setProcessStatus("0");
+                        obj.setProcessStatus("1");
                         updateById(obj);
                     }
                     //处事审核不通过
@@ -113,7 +117,7 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
 
             //按照顺序审核
             //未审核过队长先展示
-            List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(new QueryWrapper<GMaintenanceProcess>().eq("emr_id", item.getId()).eq("process_status","0"));
+            List<GMaintenanceProcess> listed = igMaintenanceProcessService.list(new QueryWrapper<GMaintenanceProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -121,15 +125,21 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
                 }
             }
             else {
-                //审核过
-                //该岗位审核过就不显示
-                listed.forEach(o->{
-                    if (o.getUserPost().equals(bo.getPostNameArias())){
-                        item.setFlag(false);
-                    }else {
-                        item.setFlag(true);
+                String regex = "^(xx|XX).{2}";
+                if (bo.getPostNameArias().matches(regex)){
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                }else {
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){
+                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
                     }
-                });
+                }
             }
         });
         return PageUtils.buildDataInfo(result);

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

@@ -1,15 +1,19 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.GUser;
 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 com.ruoyi.gas.service.IGUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -27,7 +31,8 @@ import java.util.Collection;
  */
 @Service
 public class GRegulatorBoxProcessServiceImpl extends ServicePlusImpl<GRegulatorBoxProcessMapper, GRegulatorBoxProcess, GRegulatorBoxProcessVo> implements IGRegulatorBoxProcessService {
-
+    @Autowired
+    private IGUserService igUserService;
     @Override
     public GRegulatorBoxProcessVo queryById(Long id){
         return getVoById(id);
@@ -36,6 +41,11 @@ public class GRegulatorBoxProcessServiceImpl extends ServicePlusImpl<GRegulatorB
     @Override
     public TableDataInfo<GRegulatorBoxProcessVo> queryPageList(GRegulatorBoxProcessBo bo) {
         PagePlus<GRegulatorBoxProcess, GRegulatorBoxProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item->{
+            QueryWrapper<GUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(GUser::getJobNum,item.getCreateBy());
+            item.setCreateName(igUserService.getOne(queryWrapper)!=null?igUserService.getOne(queryWrapper).getName():"");
+        });
         return PageUtils.buildDataInfo(result);
     }
 

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

@@ -0,0 +1,102 @@
+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.GRegulatorBoxRelation;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxRelationBo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxRelationVo;
+import com.ruoyi.gas.mapper.GRegulatorBoxRelationMapper;
+import com.ruoyi.gas.service.IGRegulatorBoxRelationService;
+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 org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 调压箱目录中间Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-05-24
+ */
+@Service
+public class GRegulatorBoxRelationServiceImpl extends ServicePlusImpl<GRegulatorBoxRelationMapper, GRegulatorBoxRelation, GRegulatorBoxRelationVo> implements IGRegulatorBoxRelationService {
+
+    @Override
+    public GRegulatorBoxRelationVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GRegulatorBoxRelationVo> queryPageList(GRegulatorBoxRelationBo bo) {
+        PagePlus<GRegulatorBoxRelation, GRegulatorBoxRelationVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GRegulatorBoxRelationVo> queryList(GRegulatorBoxRelationBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GRegulatorBoxRelation> buildQueryWrapper(GRegulatorBoxRelationBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GRegulatorBoxRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getJobNum() != null, GRegulatorBoxRelation::getUserId, bo.getJobNum());
+        lqw.eq(bo.getRegulatorBoxId() != null, GRegulatorBoxRelation::getRegulatorBoxId, bo.getRegulatorBoxId());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GRegulatorBoxRelationBo bo) {
+//        GRegulatorBoxRelation add = BeanUtil.toBean(bo, GRegulatorBoxRelation.class);
+//        validEntityBeforeSave(add);
+//        boolean flag = save(add);
+//        if (flag) {
+//            bo.setId(add.getId());
+//        }
+        if (!ObjectUtils.isEmpty(bo.getIds())){
+            List<GRegulatorBoxRelation> list = new ArrayList<>();
+            bo.getIds().forEach(item->{
+                GRegulatorBoxRelation boxRelation = new GRegulatorBoxRelation();
+                boxRelation.setUserId(bo.getJobNum());
+                boxRelation.setRegulatorBoxId(item);
+                list.add(boxRelation);
+            });
+            saveBatch(list);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Boolean updateByBo(GRegulatorBoxRelationBo bo) {
+        GRegulatorBoxRelation update = BeanUtil.toBean(bo, GRegulatorBoxRelation.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GRegulatorBoxRelation 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

@@ -16,6 +16,7 @@ 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.IGRegulatorBoxRelationService;
 import com.ruoyi.gas.service.IGRegulatorBoxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -79,13 +80,17 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
                 String regex = "^(xx|XX).{2}";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
-                        obj.setProcessStatus("1");
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }else if (gTeamProcess.getProcessStatus().equals("0")){
+                        //队长通过 处事没审核
+                        obj.setProcessStatus("0");
                         updateById(obj);
                     }
                 }else {
                     //处事审核通过 即主表状态通过
                     if (gTeamProcess.getProcessStatus().equals("0")){
-                        obj.setProcessStatus("0");
+                        obj.setProcessStatus("1");
                         updateById(obj);
                     }
                     //处事审核不通过
@@ -113,7 +118,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()).eq("process_status","0"));
+            List<GRegulatorBoxProcess> listed = igRegulatorBoxProcessService.list(new QueryWrapper<GRegulatorBoxProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -121,15 +126,21 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
                 }
             }
             else {
-                //审核过
-                //该岗位审核过就不显示
-                listed.forEach(o->{
-                    if (o.getUserPost().equals(bo.getPostNameArias())){
-                        item.setFlag(false);
-                    }else {
-                        item.setFlag(true);
+                String regex = "^(xx|XX).{2}";
+                if (bo.getPostNameArias().matches(regex)){
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                }else {
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){
+                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
                     }
-                });
+                }
             }
         });
         return PageUtils.buildDataInfo(result);
@@ -190,6 +201,8 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
         return lqw;
     }
 
+
+
     @Override
     public Boolean insertByBo(GRegulatorBoxBo bo) {
         GRegulatorBox add = BeanUtil.toBean(bo, GRegulatorBox.class);
@@ -262,4 +275,5 @@ public class GRegulatorBoxServiceImpl extends ServicePlusImpl<GRegulatorBoxMappe
         igRegulatorBoxProcessService.remove(new QueryWrapper<GRegulatorBoxProcess>().in("emr_id", ids));
         return removeByIds(ids);
     }
+
 }

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

@@ -66,15 +66,21 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
                 }
             }
             else {
-                //审核过
-                //该岗位审核过就不显示
-                listed.forEach(o->{
-                    if (o.getUserPost().equals(bo.getPostNameArias())){
-                        item.setFlag(false);
-                    }else {
-                        item.setFlag(true);
+                String regex = "^(xx|XX).{2}";
+                if (bo.getPostNameArias().matches(regex)){
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                }else {
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){
+                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
                     }
-                });
+                }
             }
         });
         return tableDataInfo;
@@ -225,13 +231,17 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
                 String regex = "^(xx|XX).{2}";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
-                        obj.setProcessStatus("1");
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }else if (gTeamProcess.getProcessStatus().equals("0")){
+                        //队长通过 处事没审核
+                        obj.setProcessStatus("0");
                         updateById(obj);
                     }
                 }else {
                     //处事审核通过 即主表状态通过
                     if (gTeamProcess.getProcessStatus().equals("0")){
-                        obj.setProcessStatus("0");
+                        obj.setProcessStatus("1");
                         updateById(obj);
                     }
                     //处事审核不通过

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

@@ -1,15 +1,19 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.gas.domain.GRoadsectionProcess;
+import com.ruoyi.gas.domain.GUser;
 import com.ruoyi.gas.domain.bo.GRoadsectionProcessBo;
 import com.ruoyi.gas.domain.vo.GRoadsectionProcessVo;
 import com.ruoyi.gas.mapper.GRoadsectionProcessMapper;
 import com.ruoyi.gas.service.IGRoadsectionProcessService;
+import com.ruoyi.gas.service.IGUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -32,10 +36,16 @@ public class GRoadsectionProcessServiceImpl extends ServicePlusImpl<GRoadsection
     public GRoadsectionProcessVo queryById(Long id){
         return getVoById(id);
     }
-
+    @Autowired
+    private IGUserService igUserService;
     @Override
     public TableDataInfo<GRoadsectionProcessVo> queryPageList(GRoadsectionProcessBo bo) {
         PagePlus<GRoadsectionProcess, GRoadsectionProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item->{
+            QueryWrapper<GUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(GUser::getJobNum,item.getCreateBy());
+            item.setCreateName(igUserService.getOne(queryWrapper)!=null?igUserService.getOne(queryWrapper).getName():"");
+        });
         return PageUtils.buildDataInfo(result);
     }
 

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

@@ -1,15 +1,19 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.GUser;
 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 com.ruoyi.gas.service.IGUserService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -32,10 +36,16 @@ public class GTeamProcessServiceImpl extends ServicePlusImpl<GTeamProcessMapper,
     public GTeamProcessVo queryById(Long id){
         return getVoById(id);
     }
-
+    @Autowired
+    private IGUserService igUserService;
     @Override
     public TableDataInfo<GTeamProcessVo> queryPageList(GTeamProcessBo bo) {
         PagePlus<GTeamProcess, GTeamProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item->{
+            QueryWrapper<GUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(GUser::getJobNum,item.getCreateBy());
+            item.setCreateName(igUserService.getOne(queryWrapper)!=null?igUserService.getOne(queryWrapper).getName():"");
+        });
         return PageUtils.buildDataInfo(result);
     }
 

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

@@ -81,13 +81,17 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
                 String regex = "^(xx|XX).{2}";
                 if (gTeamProcess.getUserPost().matches(regex)) {
                     if (gTeamProcess.getProcessStatus().equals("1")){
-                        obj.setProcessStatus("1");
+                        obj.setProcessStatus("2");
+                        updateById(obj);
+                    }else if (gTeamProcess.getProcessStatus().equals("0")){
+                        //队长通过 处事没审核
+                        obj.setProcessStatus("0");
                         updateById(obj);
                     }
                 }else {
                     //处事审核通过 即主表状态通过
                     if (gTeamProcess.getProcessStatus().equals("0")){
-                        obj.setProcessStatus("0");
+                        obj.setProcessStatus("1");
                         updateById(obj);
                     }
                     //处事审核不通过
@@ -116,7 +120,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()).eq("process_status","0"));
+            List<GValvewellInspectionProcess> listed = valvewellInspectionProcessService.list(new QueryWrapper<GValvewellInspectionProcess>().eq("emr_id", item.getId()).orderByDesc("create_time"));
             if (ObjectUtils.isEmpty(listed)){
                 String regex = "^(xx|XX).{2}";
                 if (bo.getPostNameArias().matches(regex)){
@@ -124,15 +128,21 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
                 }
             }
             else {
-                //审核过
-                //该岗位审核过就不显示
-                listed.forEach(o->{
-                    if (o.getUserPost().equals(bo.getPostNameArias())){
-                        item.setFlag(false);
-                    }else {
-                        item.setFlag(true);
+                String regex = "^(xx|XX).{2}";
+                if (bo.getPostNameArias().matches(regex)){
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){ item.setFlag(true); }
+                }else {
+                    if ("0".equals(item.getProcessStatus())){ item.setFlag(true); }
+                    if ("1".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("2".equals(item.getProcessStatus())){ item.setFlag(false); }
+                    if ("-1".equals(item.getProcessStatus())){
+                        if (listed.get(0).getProcessStatus().equals("0")){ item.setFlag(true);  }
+                        if (listed.get(0).getProcessStatus().equals("1")){ item.setFlag(false);  }
                     }
-                });
+                }
             }
         });
         return PageUtils.buildDataInfo(list);

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

@@ -2,16 +2,19 @@ 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.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.GRegulatingBoxMaintenance;
+import com.ruoyi.gas.domain.GUser;
 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.IGUserService;
 import com.ruoyi.gas.service.IGValvewellInspectionProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,7 +34,8 @@ import java.util.Collection;
 @Service
 public class GValvewellInspectionProcessServiceImpl extends ServicePlusImpl<GValvewellInspectionProcessMapper, GValvewellInspectionProcess, GValvewellInspectionProcessVo> implements IGValvewellInspectionProcessService {
 
-
+    @Autowired
+    private IGUserService igUserService;
     @Override
     public GValvewellInspectionProcessVo queryById(Long id){
         return getVoById(id);
@@ -40,6 +44,11 @@ public class GValvewellInspectionProcessServiceImpl extends ServicePlusImpl<GVal
     @Override
     public TableDataInfo<GValvewellInspectionProcessVo> queryPageList(GValvewellInspectionProcessBo bo) {
         PagePlus<GValvewellInspectionProcess, GValvewellInspectionProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item->{
+            QueryWrapper<GUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(GUser::getJobNum,item.getCreateBy());
+            item.setCreateName(igUserService.getOne(queryWrapper)!=null?igUserService.getOne(queryWrapper).getName():"");
+        });
         return PageUtils.buildDataInfo(result);
     }