住建

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionViewMapper.xml

@@ -154,7 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         GROUP BY a.standards) b on a.dict_value = b.standards
         where a.dict_type = 'steelcylinder_type'
-        order by a.dict_code
+        order by a.dict_sort
     </select>
 
     <select id="getThreeUserList" parameterType="CenterdataTHousingconstructionRealnameuser" resultType="map">
@@ -452,6 +452,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getSteelcylinderPointList" parameterType="CenterdataTHousingconstructionSteelcylinder" resultType="map">
         SELECT
+        SUBSTRING_INDEX( GROUP_CONCAT( l.steelcylinder_name ORDER BY sign_time DESC ), ',', 1 ) steelcylinder_name,
+        u.longitude,
+        u.latitude,
+        u.gas_address gasAddress
+        FROM
+        centerdata_t_housingconstruction_steelcylinder_log l
+        LEFT JOIN centerdata_t_housingconstruction_realnameuser u ON u.id = l.join_house_id
+        LEFT JOIN onest_system.sys_dept d ON d.dept_id = u.dept_id
+        GROUP BY
+        join_house_id
+
+
+        SELECT
             a.`name`,
             a.enterprise_id enterpriseId,
             a.steelcylinder_number steelcylinderNumber,