zengh
2021-01-14 a1de31cb6df040d28e1ad5afceb53dce7150c5de
客户列表接口修改
1 files modified
5 ■■■■■ changed files
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/equipment/mapper/EquipmentMapper.xml
@@ -59,7 +59,7 @@
    <select id="selectEquipmentPage" resultMap="equipmentResultMap">
        select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,ST_ASTEXT (coordinate ) AS
        coordinate,dtype,
        coordinate,dtype,heartbeat,expireTime,pay,
        parent_id,
        FORMAT( jd, 6 ) AS jd,
        FORMAT( wd, 6 ) AS wd,
@@ -79,7 +79,6 @@
        <if test="dtype!=null">
            and dtype=#{dtype}
        </if>
        and parent_id!=0
    </select>
    <!--新增-->
@@ -156,7 +155,7 @@
        SELECT
        dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
        dept.ownerId,dept.devicestate,dept.stime,
        ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,
        ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat,
        dept.parent_id,dept.jd,dept.wd,dept.street as streeName,u.yname,d.addvnm,dept.addvcd,
        (
        SELECT