提交

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

@@ -115,7 +115,7 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
         PagePlus<GPatrolTeam, GPatrolTeamVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         result.getRecordsVo().forEach(item -> {
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
-
+            item.setCreateByName(gUserService.queryById(Long.valueOf(item.getCreateBy())).getName());
             if (!ObjectUtils.isEmpty(bo.getPostNameArias())) {
                 //按照顺序审核
                 //未审核过队长先展示

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

@@ -112,6 +112,7 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
         }
         PagePlus<GRegulatingBoxMaintenance, GRegulatingBoxMaintenanceVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         result.getRecordsVo().forEach(item -> {
+            item.setCreateByName(gUserService.queryById(Long.valueOf(item.getCreateBy())).getName());
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
 //            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
 

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

@@ -53,6 +53,7 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         PagePlus<GRoadSectionInspection, GRoadSectionInspectionVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         TableDataInfo<GRoadSectionInspectionVo> tableDataInfo = PageUtils.buildDataInfo(result);
         tableDataInfo.getRows().forEach(item -> {
+            item.setCreateByName(gUserService.queryById(Long.valueOf(item.getCreateBy())).getName());
             item.setPhotoList(baseMapper.getPhoto(item.getId()));
 //            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
 

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

@@ -15,6 +15,7 @@ import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
 import com.ruoyi.gas.mapper.GValveWellInspectionMapper;
 import com.ruoyi.gas.mapper.GValveWellPositionMapper;
+import com.ruoyi.gas.service.IGUserService;
 import com.ruoyi.gas.service.IGValveWellInspectionPhotoService;
 import com.ruoyi.gas.service.IGValveWellInspectionService;
 import com.ruoyi.gas.service.IGValvewellInspectionProcessService;

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

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                name as name
         from g_building
         where area_id = #{areaId} and del_flag = '0'
-        order by create_time desc
+        ORDER BY CAST(name AS SIGNED) ASC
     </select>
     <select id="getByName" resultType="com.ruoyi.gas.domain.GBuilding">
         select * from g_building