提交代码

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

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.gas;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+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.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.GEmergencyRepairProcessBo;
+import com.ruoyi.gas.domain.vo.GEmergencyRepairProcessVo;
+import com.ruoyi.gas.service.IGEmergencyRepairProcessService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+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
+ *
+ * @author ruoyi
+ * @date 2024-01-16
+ */
+@Validated
+@Api(value = "抢险维修审核控制器", tags = {"抢险维修审核管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/emergencyRepairProcess")
+public class GEmergencyRepairProcessController extends BaseController {
+
+    private final IGEmergencyRepairProcessService iGEmergencyRepairProcessService;
+
+    /**
+     * 查询抢险维修审核列表
+     */
+    @ApiOperation("查询抢险维修审核列表")
+    @PreAuthorize("@ss.hasPermi('gas:emergencyRepairProcess:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GEmergencyRepairProcessVo> list(@Validated(QueryGroup.class) GEmergencyRepairProcessBo bo) {
+        return iGEmergencyRepairProcessService.queryPageList(bo);
+    }
+
+    /**
+     * 导出抢险维修审核列表
+     */
+    @ApiOperation("导出抢险维修审核列表")
+    @PreAuthorize("@ss.hasPermi('gas:emergencyRepairProcess:export')")
+    @Log(title = "抢险维修审核", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GEmergencyRepairProcessBo bo, HttpServletResponse response) {
+        List<GEmergencyRepairProcessVo> list = iGEmergencyRepairProcessService.queryList(bo);
+        ExcelUtil.exportExcel(list, "抢险维修审核", GEmergencyRepairProcessVo.class, response);
+    }
+
+    /**
+     * 获取抢险维修审核详细信息
+     */
+    @ApiOperation("获取抢险维修审核详细信息")
+    @PreAuthorize("@ss.hasPermi('gas:emergencyRepairProcess:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GEmergencyRepairProcessVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") String id) {
+        return AjaxResult.success(iGEmergencyRepairProcessService.queryById(id));
+    }
+
+    /**
+     * 新增抢险维修审核
+     */
+    @ApiOperation("新增抢险维修审核")
+//    @PreAuthorize("@ss.hasPermi('gas:emergencyRepairProcess:add')")
+    @Log(title = "抢险维修审核", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GEmergencyRepairProcessBo bo) {
+        return toAjax(iGEmergencyRepairProcessService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改抢险维修审核
+     */
+    @ApiOperation("修改抢险维修审核")
+    @PreAuthorize("@ss.hasPermi('gas:emergencyRepairProcess:edit')")
+    @Log(title = "抢险维修审核", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GEmergencyRepairProcessBo bo) {
+        return toAjax(iGEmergencyRepairProcessService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除抢险维修审核
+     */
+    @ApiOperation("删除抢险维修审核")
+    @PreAuthorize("@ss.hasPermi('gas:emergencyRepairProcess:remove')")
+    @Log(title = "抢险维修审核" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable String[] ids) {
+        return toAjax(iGEmergencyRepairProcessService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

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

@@ -25,7 +25,7 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8081
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -160,6 +160,7 @@ public class SysUser extends BaseEntity {
 	@ApiModelProperty(value = "岗位组")
 	@TableField(exist = false)
 	private Long[] postIds;
+	private String postName;
 
 	/**
 	 * 角色ID

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

@@ -20,7 +20,7 @@ import java.util.Date;
 @TableName("g_emergency_repair")
 public class GEmergencyRepair extends BaseEntity {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     private String processStatus;
     private String processComments;
@@ -33,10 +33,10 @@ public class GEmergencyRepair extends BaseEntity {
      * 报修时间
      */
     private Date repairTime;
-//    /**
-//     * 单元id
-//     */
-//    private Long unitId;
+    //    /**
+    //     * 单元id
+    //     */
+    //    private Long unitId;
     /**
      * 报修人名称
      */
@@ -86,5 +86,9 @@ public class GEmergencyRepair extends BaseEntity {
      */
     @TableLogic
     private String delFlag;
-
+    private String onSiteLeadership; // 现场领导
+    private String arrivalTime; // 到达时间
+    private String constructionTime; // 施工时间
+    private String enginName; // 工程名称
+    private String constructionPipeDiameter; // 施工管径
 }

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

@@ -0,0 +1,54 @@
+package com.ruoyi.gas.domain;
+
+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.experimental.Accessors;
+
+/**
+ * 抢险维修审核对象 g_emergency_repair_process
+ *
+ * @author ruoyi
+ * @date 2024-01-16
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_emergency_repair_process")
+public class GEmergencyRepairProcess 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/GRegulatorBox.java

@@ -31,6 +31,7 @@ public class GRegulatorBox extends BaseEntity {
      * 单元id
      */
     private Long areaId;
+    private String name;
     /**
      * 管理所
      */

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

@@ -140,5 +140,10 @@ public class GEmergencyRepairBo extends BaseEntity {
      */
     @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
+    private String onSiteLeadership; // 现场领导
+    private String arrivalTime; // 到达时间
+    private String constructionTime; // 施工时间
+    private String enginName; // 工程名称
+    private String constructionPipeDiameter; // 施工管径
 
 }

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

@@ -0,0 +1,86 @@
+package com.ruoyi.gas.domain.bo;
+
+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;
+
+/**
+ * 抢险维修审核业务对象 g_emergency_repair_process
+ *
+ * @author ruoyi
+ * @date 2024-01-16
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("抢险维修审核业务对象")
+public class GEmergencyRepairProcessBo 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("分页大小")
+    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/GRegulatorBoxBo.java

@@ -37,7 +37,6 @@ public class GRegulatorBoxBo extends BaseEntity {
      * 单元id
      */
     @ApiModelProperty(value = "小区id", required = true)
-    @NotNull(message = "小区id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long areaId;
 
     /**
@@ -46,6 +45,7 @@ public class GRegulatorBoxBo extends BaseEntity {
     @ApiModelProperty(value = "管理所", required = true)
     @NotBlank(message = "管理所不能为空", groups = { AddGroup.class, EditGroup.class })
     private String administrativeOffice;
+    private String name;
 
     /**
      * 编号

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

@@ -4,6 +4,7 @@ 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;
@@ -20,15 +21,14 @@ import java.util.List;
 @Data
 @ApiModel("庭院网管视图对象")
 @ExcelIgnoreUnannotated
-public class GCourtyardNetworkManagementVo {
+public class GCourtyardNetworkManagementVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
 	private Long areaId;
 	private String areaName;
-//	private Long buildingId;
+	private String createName;
 	private String buildingName;
-//	private String unitName;
 	private List<String> photoList;
 	private String processStatus;
 	private String processComments;

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

@@ -0,0 +1,64 @@
+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;
+
+
+
+/**
+ * 抢险维修审核视图对象 g_emergency_repair_process
+ *
+ * @author ruoyi
+ * @date 2024-01-16
+ */
+@Data
+@ApiModel("抢险维修审核视图对象")
+@ExcelIgnoreUnannotated
+public class GEmergencyRepairProcessVo 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 = "审核状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "process_status")
+	@ApiModelProperty("审核状态")
+	private String processStatus;
+
+    /**
+     * 审核意见
+     */
+	@ExcelProperty(value = "审核意见")
+	@ApiModelProperty("审核意见")
+	private String processComments;
+
+    /**
+     * 审核人岗位
+     */
+	@ExcelProperty(value = "审核人岗位")
+	@ApiModelProperty("审核人岗位")
+	private String userPost;
+
+
+}

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

@@ -31,6 +31,7 @@ public class GEmergencyRepairVo {
 //	private String buildingName;
 //	private String unitName;
 	private List<String> photoList;
+	private List<GEmergencyRepairProcessVo> processList;
 
     /**
      * 主键ID
@@ -129,5 +130,9 @@ public class GEmergencyRepairVo {
 	@ApiModelProperty("备注")
 	private String remarks;
 
-
+	private String onSiteLeadership; // 现场领导
+	private String arrivalTime; // 到达时间
+	private String constructionTime; // 施工时间
+	private String enginName; // 工程名称
+	private String constructionPipeDiameter; // 施工管径
 }

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

@@ -28,9 +28,11 @@ public class GRegulatorBoxVo extends BaseEntity {
 
 //	private Long areaId;
 	private String areaName;
+	private String name;
 //	private Long buildingId;
 //	private String buildingName;
 //	private String unitName;
+	private String createByName;
 	private List<String> photoList;
     /**
      * 主键

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GWarningPileVo.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,11 +19,12 @@ import java.util.List;
 @Data
 @ApiModel("警示桩视图对象")
 @ExcelIgnoreUnannotated
-public class GWarningPileVo {
+public class GWarningPileVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
 	private List<String> photoList;
+	private String createByName;
     /**
      * 主键id
      */

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

@@ -0,0 +1,14 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.gas.domain.GEmergencyRepairProcess;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+
+/**
+ * 抢险维修审核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-16
+ */
+public interface GEmergencyRepairProcessMapper extends BaseMapperPlus<GEmergencyRepairProcess> {
+
+}

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

@@ -0,0 +1,56 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.gas.domain.GEmergencyRepairProcess;
+import com.ruoyi.gas.domain.vo.GEmergencyRepairProcessVo;
+import com.ruoyi.gas.domain.bo.GEmergencyRepairProcessBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 抢险维修审核Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-16
+ */
+public interface IGEmergencyRepairProcessService extends IServicePlus<GEmergencyRepairProcess, GEmergencyRepairProcessVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GEmergencyRepairProcessVo queryById(String id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GEmergencyRepairProcessVo> queryPageList(GEmergencyRepairProcessBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GEmergencyRepairProcessVo> queryList(GEmergencyRepairProcessBo bo);
+
+	/**
+	 * 根据新增业务对象插入抢险维修审核
+	 * @param bo 抢险维修审核新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GEmergencyRepairProcessBo bo);
+
+	/**
+	 * 根据编辑业务对象修改抢险维修审核
+	 * @param bo 抢险维修审核编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GEmergencyRepairProcessBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GEmergencyRepairProcessServiceImpl.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.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.GEmergencyRepairProcess;
+import com.ruoyi.gas.domain.bo.GEmergencyRepairProcessBo;
+import com.ruoyi.gas.domain.vo.GEmergencyRepairProcessVo;
+import com.ruoyi.gas.mapper.GEmergencyRepairProcessMapper;
+import com.ruoyi.gas.service.IGEmergencyRepairProcessService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 抢险维修审核Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-01-16
+ */
+@Service
+public class GEmergencyRepairProcessServiceImpl extends ServicePlusImpl<GEmergencyRepairProcessMapper, GEmergencyRepairProcess, GEmergencyRepairProcessVo> implements IGEmergencyRepairProcessService {
+
+    @Override
+    public GEmergencyRepairProcessVo queryById(String id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GEmergencyRepairProcessVo> queryPageList(GEmergencyRepairProcessBo bo) {
+        PagePlus<GEmergencyRepairProcess, GEmergencyRepairProcessVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GEmergencyRepairProcessVo> queryList(GEmergencyRepairProcessBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GEmergencyRepairProcess> buildQueryWrapper(GEmergencyRepairProcessBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GEmergencyRepairProcess> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEmrId() != null, GEmergencyRepairProcess::getEmrId, bo.getEmrId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessStatus()), GEmergencyRepairProcess::getProcessStatus, bo.getProcessStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getProcessComments()), GEmergencyRepairProcess::getProcessComments, bo.getProcessComments());
+        lqw.eq(StringUtils.isNotBlank(bo.getUserPost()), GEmergencyRepairProcess::getUserPost, bo.getUserPost());
+        lqw.last("ORDER BY create_time DESC");
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GEmergencyRepairProcessBo bo) {
+        GEmergencyRepairProcess add = BeanUtil.toBean(bo, GEmergencyRepairProcess.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GEmergencyRepairProcessBo bo) {
+        GEmergencyRepairProcess update = BeanUtil.toBean(bo, GEmergencyRepairProcess.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GEmergencyRepairProcess entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

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

@@ -11,9 +11,11 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GEmergencyRepair;
 import com.ruoyi.gas.domain.bo.GEmergencyRepairBo;
 import com.ruoyi.gas.domain.bo.GEmergencyRepairPhotoBo;
+import com.ruoyi.gas.domain.bo.GEmergencyRepairProcessBo;
 import com.ruoyi.gas.domain.vo.GEmergencyRepairVo;
 import com.ruoyi.gas.mapper.GEmergencyRepairMapper;
 import com.ruoyi.gas.service.IGEmergencyRepairPhotoService;
+import com.ruoyi.gas.service.IGEmergencyRepairProcessService;
 import com.ruoyi.gas.service.IGEmergencyRepairService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,12 +43,19 @@ public class GEmergencyRepairServiceImpl extends ServicePlusImpl<GEmergencyRepai
         byId.setPhotoList(baseMapper.getPhoto(id));
         return byId;
     }
-
+    @Autowired
+    private IGEmergencyRepairProcessService igEmergencyRepairProcessService;
     @Override
     public TableDataInfo<GEmergencyRepairVo> queryPageList(GEmergencyRepairBo bo) {
         Page<GEmergencyRepairVo> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         Page<GEmergencyRepairVo> 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()));
+            GEmergencyRepairProcessBo processBo = new GEmergencyRepairProcessBo();
+            processBo.setEmrId(item.getId());
+            processBo.setIsAsc("desc");
+            item.setProcessList(igEmergencyRepairProcessService.queryList(processBo));
+        });
         return PageUtils.buildDataInfo(list);
     }
 

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

@@ -60,6 +60,12 @@ public class GWarningPileServiceImpl extends ServicePlusImpl<GWarningPileMapper,
                     continue;
                 item.setUserName(StringUtils.isEmpty(item.getUserName()) ? voById.getName() : item.getUserName() + "," + voById.getName());
             }
+            GUserVo voById = gUserService.getVoById(item.getCreateBy());
+            if (ObjectUtils.isEmpty(voById)) {
+                item.setCreateByName(item.getCreateBy());
+            } else {
+                item.setCreateByName(voById.getName());
+            }
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
         });
 

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

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GCourtyardNetworkManagementVo">
         select a.*,
+        (select u.name from g_user u where u.id = a.create_by and u.del_flag = 0) AS createName,
         c.name AS buildingName,
         d.name AS areaName
         from g_courtyard_network_management a

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

@@ -26,6 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="processStatus" column="process_status"/>
         <result property="processComments" column="process_comments"/>
+        <result property="onSiteLeadership" column="on_site_leadership"/>
+        <result property="arrivalTime" column="arrival_time"/>
+        <result property="constructionTime" column="construction_time"/>
+        <result property="enginName" column="engin_name"/>
+        <result property="constructionPipeDiameter" column="construction_pipe_diameter"/>
     </resultMap>
 
     <select id="getPhoto" resultType="java.lang.String">
@@ -37,13 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GEmergencyRepairVo">
         select a.*
         from g_emergency_repair a
         <where>
             a.del_flag = '0'
             <if test="p.repairName != null  and p.repairName != ''">
@@ -63,12 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getById" resultType="com.ruoyi.gas.domain.vo.GEmergencyRepairVo">
         select a.*
         from g_emergency_repair a
         where a.id = #{id}
           and a.del_flag = '0'
     </select>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.gas.mapper.GEmergencyRepairProcessMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GEmergencyRepairProcess" id="GEmergencyRepairProcessResult">
+        <result property="id" column="id"/>
+        <result property="emrId" column="emr_id"/>
+        <result property="processStatus" column="process_status"/>
+        <result property="processComments" column="process_comments"/>
+        <result property="userPost" column="user_post"/>
+        <result property="remarks" column="remarks"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.ruoyi.gas.domain.GRegulatorBox" id="GRegulatorBoxResult">
         <result property="id" column="id"/>
         <result property="areaId" column="area_id"/>
+        <result property="name" column="name"/>
         <result property="administrativeOffice" column="administrative_office"/>
         <result property="number" column="number"/>
         <result property="businessService" column="business_service"/>
@@ -62,7 +63,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GRegulatorBoxVo">
         select a.*,
-        d.name AS areaName
+        d.name AS areaName,
+        (select name from g_user u where u.id = a.create_by) AS createByName
         from g_regulator_box a
         left join g_area d on d.id = a.area_id and d.del_flag = '0'
         <where>

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -12,6 +12,7 @@
         <result property="email" column="email"/>
         <result property="phonenumber" column="phonenumber"/>
         <result property="sex" column="sex"/>
+        <result property="postName" column="post_name"/>
         <result property="avatar" column="avatar"/>
         <result property="password" column="password"/>
         <result property="status" column="status"/>
@@ -56,6 +57,7 @@
                u.password,
                u.sex,
                u.status,
+               (SELECT post_code FROM sys_post po WHERE po.post_id = p.post_id) AS post_name,
                u.del_flag,
                u.login_ip,
                u.login_date,
@@ -76,6 +78,7 @@
                r.status as role_status
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
+            left join sys_user_post p on u.user_id = p.user_id
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>