提交代码

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

@@ -17,22 +17,19 @@ public class GPressureRegulatingBoxExcelVo implements Serializable {
     /**
      * 性质
      */
-    @ExcelProperty(value = "性质", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "tyx_nature")
+    @ExcelProperty(value = "性质")
     private String nature;
 
     /**
      * 类型
      */
-    @ExcelProperty(value = "类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "tyx_type")
+    @ExcelProperty(value = "类型")
     private String type;
 
     /**
      * 路数
      */
-    @ExcelProperty(value = "路数", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "tyx_numberOfRoutes")
+    @ExcelProperty(value = "路数")
     private String numberOfRoutes;
 
     /**

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GValveWellInspectionVo.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 com.ruoyi.gas.domain.GValveWellPosition;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +21,7 @@ import java.util.List;
 @Data
 @ApiModel("阀井巡查视图对象")
 @ExcelIgnoreUnannotated
-public class GValveWellInspectionVo {
+public class GValveWellInspectionVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -60,6 +61,7 @@ public class GValveWellInspectionVo {
 	@ExcelProperty(value = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
+	private String createByName;
 
 
 }

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

@@ -13,4 +13,5 @@ import java.util.List;
  */
 public interface GValveWellInspectionMapper extends BaseMapperPlus<GValveWellInspection> {
     List<String> getPhoto(Long id);
+    String getName(String id);
 }

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

@@ -50,6 +50,7 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
         PagePlus<GValveWellInspection, GValveWellInspectionVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         TableDataInfo<GValveWellInspectionVo> tableDataInfo = PageUtils.buildDataInfo(result);
         tableDataInfo.getRows().forEach(item -> {
+            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
             item.setPosition(positionMapper.selectById(item.getPositionId()));
         });

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

@@ -23,5 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where parent_id = #{id}
           and del_flag = '0'
     </select>
+    <select id="getName" resultType="java.lang.String">
+        SELECT name FROM g_user WHERE id = #{id}
+          and del_flag = '0'
+    </select>
 
 </mapper>