浏览代码

提交代码

JX.Li 1 年之前
父节点
当前提交
78e6840903

+ 3 - 1
ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRoadSectionInspectionVo.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;
@@ -21,7 +22,7 @@ import java.util.List;
 @Data
 @ApiModel("路段巡查视图对象")
 @ExcelIgnoreUnannotated
-public class GRoadSectionInspectionVo {
+public class GRoadSectionInspectionVo  extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -68,6 +69,7 @@ public class GRoadSectionInspectionVo {
 	@ExcelProperty(value = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
+	private String createByName;
 
 
 }

+ 1 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRoadSectionInspectionMapper.java

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

+ 5 - 1
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRoadSectionInspectionServiceImpl.java

@@ -43,7 +43,11 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
     public TableDataInfo<GRoadSectionInspectionVo> queryPageList(GRoadSectionInspectionBo bo) {
         PagePlus<GRoadSectionInspection, GRoadSectionInspectionVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         TableDataInfo<GRoadSectionInspectionVo> tableDataInfo = PageUtils.buildDataInfo(result);
-        tableDataInfo.getRows().forEach(item -> item.setPhotoList(baseMapper.getPhoto(item.getId())));
+        tableDataInfo.getRows().forEach(item -> {
+            item.setPhotoList(
+                    baseMapper.getPhoto(item.getId()));
+            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+        });
         return tableDataInfo;
     }
 

+ 5 - 0
ruoyi-gas/src/main/resources/mapper/GRoadSectionInspectionMapper.xml

@@ -25,5 +25,10 @@ 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>