提交代码

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

@@ -33,6 +33,8 @@ public class GRegulatorBox extends BaseEntity {
     private Long areaId;
     private String name;
     private Long parentId;
+    private String remarks;
+    private String processStatus;
     /**
      * 管理所
      */
@@ -169,7 +171,7 @@ public class GRegulatorBox extends BaseEntity {
     /**
      * 备注
      */
-    private String remarks;
+    private String remark;
     /**
      * 删除标志
      */

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

@@ -1,16 +1,13 @@
 package com.ruoyi.gas.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 路段巡查对象 g_road_section_inspection
@@ -25,6 +22,8 @@ public class GRoadSectionInspection extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
+    private String remarks;
+    private String processStatus;
     /**
      * 主键id
      */

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

@@ -1,16 +1,13 @@
 package com.ruoyi.gas.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 阀井巡查对象 g_valve_well_inspection
@@ -24,9 +21,11 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class GValveWellInspection extends BaseEntity {
 
     private static final long serialVersionUID=1L;
+    private String remarks;
+    private String processStatus;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;

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

@@ -1,14 +1,11 @@
 package com.ruoyi.gas.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 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_valve_well_position
@@ -22,9 +19,17 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class GValveWellPosition extends BaseEntity {
 
     private static final long serialVersionUID=1L;
-
+    private String district;
+    private String team;
+    private String valveHeadShape;
+    private String valveWellDepth;
+    private String manholeCoverInstead;
+    private String waterCondition;
+    private String pressureRating;
+    private String isXyxjcnkg;
+    private String remarks;
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;

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

@@ -268,5 +268,7 @@ public class GRegulatorBoxBo extends BaseEntity {
     private String isAsc;
     private String ranks;
     private Long parentId;
+    private String remark;
+    private String processStatus;
 
 }

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

@@ -28,6 +28,8 @@ public class GRoadSectionInspectionBo extends BaseEntity {
 
     private String ranks;
     private List<Long> uids;
+    private String remarks;
+    private String processStatus;
     /**
      * 主键id
      */

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

@@ -2,15 +2,11 @@ package com.ruoyi.gas.domain.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
-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.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -28,18 +24,18 @@ public class GValveWellInspectionBo extends BaseEntity {
 
     private List<String> photoList;
     private String ranks;
+    private String remarks;
+    private String processStatus;
     /**
      *
      */
     @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 positionId;
     private String valveWellName;
 
@@ -47,7 +43,6 @@ public class GValveWellInspectionBo extends BaseEntity {
      * 发现问题
      */
     @ApiModelProperty(value = "发现问题", required = true)
-    @NotBlank(message = "发现问题不能为空", groups = { AddGroup.class, EditGroup.class })
     private String discoverProblems;
 
     /**

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

@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
 public class GValveWellPositionBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @ApiModelProperty(value = "", required = true)
     @NotNull(message = "不能为空", groups = { EditGroup.class })
@@ -89,4 +89,14 @@ public class GValveWellPositionBo extends BaseEntity {
     @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
 
+    private String district;
+    private String team;
+    private String valveHeadShape;
+    private String valveWellDepth;
+    private String manholeCoverInstead;
+    private String waterCondition;
+    private String pressureRating;
+    private String isXyxjcnkg;
+    private String remarks;
+
 }

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

@@ -35,6 +35,8 @@ public class GRegulatorBoxVo extends BaseEntity {
 	private String createByName;
 	private Long parentId;
 	private List<String> photoList;
+	private String remark;
+	private String processStatus;
     /**
      * 主键
      */

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

@@ -27,6 +27,8 @@ public class GRoadSectionInspectionVo  extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	private List<String> photoList;
+	private String remarks;
+	private String processStatus;
     /**
      * 主键id
      */

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

@@ -28,7 +28,7 @@ public class GValveWellInspectionVo extends BaseEntity {
 	private List<String> photoList;
 	GValveWellPosition position;
     /**
-     * 
+     *
      */
 	@ExcelProperty(value = "")
 	@ApiModelProperty("")
@@ -61,6 +61,8 @@ public class GValveWellInspectionVo extends BaseEntity {
 	@ExcelProperty(value = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
+	private String remarks;
+	private String processStatus;
 	private String createByName;
 
 

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

@@ -24,6 +24,8 @@ public class GValveWellInspectionVos{
 	private String discoverProblems;
 	private String remark;
 	private String positionName;
+	private String remarks;
+	private String processStatus;
 	private Long positionId;
 	private Date createTime;
 	private String createBy;

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

@@ -2,12 +2,9 @@ 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;
 
 
 
@@ -23,9 +20,17 @@ import java.util.Date;
 public class GValveWellPositionVo {
 
 	private static final long serialVersionUID = 1L;
-
+	private String district;
+	private String team;
+	private String valveHeadShape;
+	private String valveWellDepth;
+	private String manholeCoverInstead;
+	private String waterCondition;
+	private String pressureRating;
+	private String isXyxjcnkg;
+	private String remarks;
     /**
-     * 
+     *
      */
 	@ExcelProperty(value = "")
 	@ApiModelProperty("")

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

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         u.name AS createByName,
         vwi.discover_problems,
         vwi.remark,
+        vwi.remarks,
+        vwi.process_status,
         vwi.create_time
         FROM
         g_valve_well_inspection vwi