|
@@ -848,11 +848,11 @@
|
|
|
td.has_zz as bzzt,
|
|
td.has_zz as bzzt,
|
|
|
td.hbcrhtbh as hbcrhtbh,
|
|
td.hbcrhtbh as hbcrhtbh,
|
|
|
td.hbcrht_date as hbcrhtrq,
|
|
td.hbcrht_date as hbcrhtrq,
|
|
|
- (SELECT immobile."preAssignCode"
|
|
|
|
|
|
|
+ (SELECT immobile.pre_assign_code
|
|
|
FROM t_project_immobile_code immobile
|
|
FROM t_project_immobile_code immobile
|
|
|
WHERE immobile.project_id = pro.id
|
|
WHERE immobile.project_id = pro.id
|
|
|
AND immobile.valid_flag = 1
|
|
AND immobile.valid_flag = 1
|
|
|
- AND immobile."preAssignCode" IS NOT NULL
|
|
|
|
|
|
|
+ AND immobile.pre_assign_code IS NOT NULL
|
|
|
LIMIT 1) as yfbdcdyh,
|
|
LIMIT 1) as yfbdcdyh,
|
|
|
(SELECT array_to_string(array_agg(ST_AsEWKT(gd.geom)), '|')
|
|
(SELECT array_to_string(array_agg(ST_AsEWKT(gd.geom)), '|')
|
|
|
FROM t_node_land nl
|
|
FROM t_node_land nl
|
|
@@ -884,7 +884,7 @@
|
|
|
SELECT 1 FROM t_project_immobile_code immobile3
|
|
SELECT 1 FROM t_project_immobile_code immobile3
|
|
|
WHERE immobile3.project_id = pro.id
|
|
WHERE immobile3.project_id = pro.id
|
|
|
AND immobile3.valid_flag = 1
|
|
AND immobile3.valid_flag = 1
|
|
|
- AND immobile3."preAssignCode" LIKE '%' || #{yfbdcdyh} || '%'
|
|
|
|
|
|
|
+ AND immobile3.pre_assign_code LIKE '%' || #{yfbdcdyh} || '%'
|
|
|
)
|
|
)
|
|
|
</if>
|
|
</if>
|
|
|
<if test="ewkt != null and ewkt != ''">
|
|
<if test="ewkt != null and ewkt != ''">
|
