巡检车队加字段

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

@@ -46,5 +46,6 @@ public class GPatrolTeam extends BaseEntity {
     private String remark;
     private String processComments;
     private String processStatus;
+    private String isReport;
 
 }

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

@@ -56,10 +56,17 @@ public class GPatrolTeamBo extends BaseEntity {
     /**
      * 是否正常巡检
      */
-    @ApiModelProperty(value = "是否正常巡检", required = true)
+    @ApiModelProperty(value = "是否周期巡检", required = true)
 //    @NotBlank(message = "是否正常巡检不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isNormalInspection;
 
+    /**
+     * 是否正常巡检
+     */
+    @ApiModelProperty(value = "是否告警", required = true)
+//    @NotBlank(message = "是否正常巡检不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isReport;
+
     private String remark;
 
 

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

@@ -55,9 +55,15 @@ public class GPatrolTeamVo extends BaseEntity {
     /**
      * 是否正常巡检
      */
-	@ExcelProperty(value = "是否正常巡检")
-	@ApiModelProperty("是否正常巡检")
+	@ExcelProperty(value = "是否周期巡检")
+	@ApiModelProperty("是否周期巡检")
 	private String isNormalInspection;
+	/**
+     * 是否告警
+     */
+	@ExcelProperty(value = "是否告警")
+	@ApiModelProperty("是否告警")
+	private String isReport;
 
 	@ExcelProperty(value = "备注")
 	@ApiModelProperty("备注")

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

@@ -157,6 +157,7 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
         lqw.eq(StringUtils.isNotBlank(bo.getTeam()), GPatrolTeam::getTeam, bo.getTeam());
         lqw.eq(StringUtils.isNotBlank(bo.getUploadLocation()), GPatrolTeam::getUploadLocation, bo.getUploadLocation());
         lqw.eq(StringUtils.isNotBlank(bo.getIsNormalInspection()), GPatrolTeam::getIsNormalInspection, bo.getIsNormalInspection());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsReport()), GPatrolTeam::getIsReport, bo.getIsReport());
 //        lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GPatrolTeam::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) ? bo.getUids() : Arrays.asList(0L));
         lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GPatrolTeam::getCreateBy, bo.getCreateBy());
         if (!"-1".equals(bo.getProcessStatus())) {