|
@@ -11,6 +11,9 @@
|
|
|
<if test="dlbm!=null and dlbm!='' ">
|
|
|
where dlbm like concat(#{dlbm},'%')
|
|
|
</if>
|
|
|
+ <if test="xzqhdm!=null and xzqhdm!='' ">
|
|
|
+ where bsm like concat(#{xzqhdm},'%')
|
|
|
+ </if>
|
|
|
)t1)t2
|
|
|
</select>
|
|
|
|
|
@@ -22,6 +25,9 @@
|
|
|
<if test="dlbm!=null and dlbm!='' ">
|
|
|
where dlbm like concat(#{dlbm},'%')
|
|
|
</if>
|
|
|
+ <if test="xzqhdm!=null and xzqhdm!='' ">
|
|
|
+ where bsm like concat(#{xzqhdm},'%')
|
|
|
+ </if>
|
|
|
)t1 group by dlmc)t2
|
|
|
</select>
|
|
|
|
|
@@ -29,10 +35,13 @@
|
|
|
select t2.*, round(t2.mj*0.0015,2) mj_m, round(t2.mj*0.0001,2) mj_gq, round(t2.mj*0.000001,2) mj_qm,t2.xzqdm ,
|
|
|
t3.name xqdmc from (
|
|
|
select round((coalesce(sum(mj::numeric), 0)),2) mj ,count(*) gs ,xzqdm from (
|
|
|
- select "${areacolumn}" as mj ,dlmc,substr(xzqdm,1,6) xzqdm from vector."${sjy}"
|
|
|
+ select "${areacolumn}" as mj ,dlmc,substr(bsm,1,6) xzqdm from vector."${sjy}"
|
|
|
<if test="dlbm!=null and dlbm!='' ">
|
|
|
where dlbm like concat(#{dlbm},'%')
|
|
|
</if>
|
|
|
+ <if test="xzqhdm!=null and xzqhdm!='' ">
|
|
|
+ where bsm like concat(#{xzqhdm},'%')
|
|
|
+ </if>
|
|
|
)t1 group by xzqdm)t2 left join vector.xzqh t3 on t3.id = t2.xzqdm
|
|
|
</select>
|
|
|
|