提交代码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MPatrolRecordController.java

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
 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.utils.poi.ExcelUtil;
 import com.ruoyi.gas.domain.bo.GPatrolRecordBo;
 import com.ruoyi.gas.domain.vo.GPatrolRecordVo;
 import com.ruoyi.gas.service.IGPatrolRecordService;
@@ -17,11 +16,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Arrays;
-import java.util.List;
 
 /**
  * 巡查记录Controller
@@ -33,7 +30,7 @@ import java.util.List;
 @Api(value = "巡查记录控制器", tags = {"巡查记录管理"})
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @RestController
-@RequestMapping("/gas/patrolRecord")
+@RequestMapping("/mobile/patrolRecord")
 public class MPatrolRecordController extends BaseController {
 
     private final IGPatrolRecordService iGPatrolRecordService;
@@ -47,15 +44,6 @@ public class MPatrolRecordController extends BaseController {
     }
 
     /**
-     * 导出巡查记录列表
-     */
-    @GetMapping("/export")
-    public void export(@Validated GPatrolRecordBo bo, HttpServletResponse response) {
-        List<GPatrolRecordVo> list = iGPatrolRecordService.queryList(bo);
-        ExcelUtil.exportExcel(list, "巡查记录", GPatrolRecordVo.class, response);
-    }
-
-    /**
      * 获取巡查记录详细信息
      */
     @GetMapping("/{id}")

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GCourtyardNetworkManagement.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_courtyard_network_management
@@ -22,6 +19,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class GCourtyardNetworkManagement extends BaseEntity {
 
     private static final long serialVersionUID=1L;
+    private String processStatus;
+    private String processComments;
 
     /**
      * 主键id

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

@@ -22,6 +22,8 @@ public class GEmergencyRepair extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
+    private String processStatus;
+    private String processComments;
     /**
      * 主键id
      */

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

@@ -25,6 +25,8 @@ import java.util.List;
 public class GCourtyardNetworkManagementBo extends BaseEntity {
 
     private List<String> photoList;
+    private String processStatus;
+    private String processComments;
     /**
      * 主键id
      */
@@ -36,21 +38,18 @@ public class GCourtyardNetworkManagementBo extends BaseEntity {
      * 单元id
      */
     @ApiModelProperty(value = "单元id", required = true)
-    @NotNull(message = "单元id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long unitId;
 
     /**
      * 发现问题
      */
     @ApiModelProperty(value = "发现问题", required = true)
-    @NotBlank(message = "发现问题不能为空", groups = { AddGroup.class, EditGroup.class })
     private String findProblem;
 
     /**
      * 备注
      */
     @ApiModelProperty(value = "备注", required = true)
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remarks;
 
 

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

@@ -2,14 +2,12 @@ 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;
@@ -27,6 +25,8 @@ import java.util.List;
 public class GEmergencyRepairBo extends BaseEntity {
 
     private List<String> photoList;
+    private String processStatus;
+    private String processComments;
 
     /**
      * 主键id
@@ -39,7 +39,6 @@ public class GEmergencyRepairBo extends BaseEntity {
      * 报修时间
      */
     @ApiModelProperty(value = "报修时间", required = true)
-    @NotNull(message = "报修时间不能为空", groups = { AddGroup.class, EditGroup.class })
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date repairTime;
 
@@ -54,70 +53,60 @@ public class GEmergencyRepairBo extends BaseEntity {
      * 报修人名称
      */
     @ApiModelProperty(value = "报修人名称", required = true)
-    @NotBlank(message = "报修人名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairName;
 
     /**
      * 报修人电话
      */
     @ApiModelProperty(value = "报修人电话", required = true)
-    @NotBlank(message = "报修人电话不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairPhone;
 
     /**
      * 报修类型
      */
     @ApiModelProperty(value = "报修类型", required = true)
-    @NotBlank(message = "报修类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairType;
 
     /**
      * 报修内容
      */
     @ApiModelProperty(value = "报修内容", required = true)
-    @NotBlank(message = "报修内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairContent;
 
     /**
      * 损坏原因
      */
     @ApiModelProperty(value = "损坏原因", required = true)
-    @NotBlank(message = "损坏原因不能为空", groups = { AddGroup.class, EditGroup.class })
     private String causesOfDamage;
 
     /**
      * 管线压力
      */
     @ApiModelProperty(value = "管线压力", required = true)
-    @NotBlank(message = "管线压力不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pipelinePressure;
 
     /**
      * 停气方式
      */
     @ApiModelProperty(value = "停气方式", required = true)
-    @NotBlank(message = "停气方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String stopGasMethod;
 
     /**
      * 使用材料
      */
     @ApiModelProperty(value = "使用材料", required = true)
-    @NotBlank(message = "使用材料不能为空", groups = { AddGroup.class, EditGroup.class })
     private String usingMaterials;
 
     /**
      * 维修人
      */
     @ApiModelProperty(value = "维修人", required = true)
-    @NotBlank(message = "维修人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String maintenanceName;
 
     /**
      * 维修时间
      */
     @ApiModelProperty(value = "维修时间", required = true)
-    @NotNull(message = "维修时间不能为空", groups = { AddGroup.class, EditGroup.class })
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date maintenanceTime;
 

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

@@ -30,6 +30,8 @@ public class GCourtyardNetworkManagementVo {
 	private String buildingName;
 	private String unitName;
 	private List<String> photoList;
+	private String processStatus;
+	private String processComments;
     /**
      * 主键id
      */

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

@@ -23,6 +23,8 @@ public class GEmergencyRepairVo {
 
 	private static final long serialVersionUID = 1L;
 
+	private String processStatus;
+	private String processComments;
 //	private Long areaId;
 //	private String areaName;
 //	private Long buildingId;

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

@@ -38,6 +38,7 @@ public class GPatrolRecordVo {
 	@ApiModelProperty("巡查人员id")
 	private Long userId;
 	private String userName;
+	private String remarks;
 
     /**
      * 警示桩id

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

@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="processStatus" column="process_status"/>
+        <result property="processComments" column="process_comments"/>
     </resultMap>
 
     <select id="getPhoto" resultType="java.lang.String">

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

@@ -24,6 +24,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="processStatus" column="process_status"/>
+        <result property="processComments" column="process_comments"/>
     </resultMap>
 
     <select id="getPhoto" resultType="java.lang.String">

ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MUserServiceImpl.java

@@ -82,6 +82,7 @@ public class MUserServiceImpl extends ServicePlusImpl<MUserMapper, MUser, MUserV
     public MUserVo getName() {
         MUserVo vo = new MUserVo();
         MUser user = SecurityUtils.getWxLoginUser().getMUser();
+        vo.setId(user.getId());
         vo.setName(user.getName());
         vo.setPower(user.getPower());
         vo.setCivilPower(user.getCivilPower());

ruoyi-mobile/src/main/resources/mapper/mobile/MUserMapper.xml

@@ -39,12 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            OR c.remarks LIKE concat('%',#{value},'%')
         UNION ALL
         SELECT d.id   AS id,
-               d.NAME AS name,
+               wp.NAME AS name,
                "4"    AS type
-        FROM `g_warning_pile` d
-        WHERE d.NAME LIKE concat('%',#{value},'%')
-           OR d.remarks LIKE concat('%',#{value},'%')
-           OR d.warning_pile_info LIKE concat('%',#{value},'%')
+        FROM `g_patrol_record` d
+        left join g_warning_pile wp on d.warning_pile_id = wp.id and wp.NAME LIKE concat('%',#{value},'%')
+           OR wp.remarks LIKE concat('%',#{value},'%')
+           OR wp.warning_pile_info LIKE concat('%',#{value},'%')
     </select>
 
 </mapper>