popovspiridon99/universal_is
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

exclude duplicate object_id

Browse Source
This commit is contained in:
popovspiridon99
2025-12-22 14:09:48 +09:00
parent 4308c84a8b
commit 677709c1bf
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/gis/gis.service.ts
View File

@ -121,13 +121,12 @@ export class GisService {
async getFigures(offset: number, limit: number, year: number, city_id: number): Promise<any[]> { async getFigures(offset: number, limit: number, year: number, city_id: number): Promise<any[]> {
const result = await this.emsDataSource.query(` const result = await this.emsDataSource.query(`
SELECT * FROM figures f SELECT o.*, f.[figure_type_id], f.[left], f.[top], f.[width], f.[height], f.[angle], f.[points], f.[label_left], f.[label_top], f.[label_angle], f.[label_size] FROM New_Gis..figures f
JOIN nGeneral..vObjects o ON f.object_id = o.object_id WHERE o.id_city = ${city_id} AND f.year = ${year} JOIN nGeneral..vObjects o ON o.object_id = f.object_id WHERE o.id_city = ${city_id} AND f.year = ${year}
ORDER BY f.year ORDER BY f.year
OFFSET ${Number(offset) || 0} ROWS OFFSET ${Number(offset) || 0} ROWS
FETCH NEXT ${Number(limit) || 10} ROWS ONLY; FETCH NEXT ${Number(limit) || 10} ROWS ONLY;
`) `)
return result return result
} }