## Opt - 区域体系增加查询条件
This commit is contained in:
parent
4ff23dadbd
commit
8bea3e39b6
|
@ -144,7 +144,9 @@
|
||||||
p.name provinceVal,
|
p.name provinceVal,
|
||||||
c.name cityVal,
|
c.name cityVal,
|
||||||
pc.name countyVal,
|
pc.name countyVal,
|
||||||
bg.GRADE_NAME gradeName
|
bg.GRADE_NAME gradeName,
|
||||||
|
brv.pk_id as regionVertexPkId,
|
||||||
|
brv.name as regionVertexName
|
||||||
FROM CU_MEMBER_RETAIL_REGION CRR
|
FROM CU_MEMBER_RETAIL_REGION CRR
|
||||||
INNER JOIN CU_MEMBER CM
|
INNER JOIN CU_MEMBER CM
|
||||||
ON CRR.PK_MEMBER = CM.PK_ID
|
ON CRR.PK_MEMBER = CM.PK_ID
|
||||||
|
@ -158,6 +160,8 @@
|
||||||
LEFT JOIN BD_AREA PC
|
LEFT JOIN BD_AREA PC
|
||||||
ON PC.PK_ID = CRR.COUNTY
|
ON PC.PK_ID = CRR.COUNTY
|
||||||
AND PC.DEL_FLAG = 0
|
AND PC.DEL_FLAG = 0
|
||||||
|
left join BD_REGION_VERTEX brv
|
||||||
|
on brv.pk_id = crr.REGION_VERTEX_PK_ID
|
||||||
where CRR.DEL_FLAG = 0
|
where CRR.DEL_FLAG = 0
|
||||||
<if test="pkCountry != null">
|
<if test="pkCountry != null">
|
||||||
and CRR.PK_COUNTRY = #{pkCountry}
|
and CRR.PK_COUNTRY = #{pkCountry}
|
||||||
|
@ -201,6 +205,9 @@
|
||||||
<if test="source!=null">
|
<if test="source!=null">
|
||||||
and CRR.source=#{source}
|
and CRR.source=#{source}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="regionVertexPkId != null">
|
||||||
|
and brv.pk_id = #{regionVertexPkId}
|
||||||
|
</if>
|
||||||
order by CRR.CREATION_TIME desc
|
order by CRR.CREATION_TIME desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@ import com.hzs.system.base.mapper.BdRegionVertexMapper;
|
||||||
import com.hzs.system.base.service.IBdRegionVertexService;
|
import com.hzs.system.base.service.IBdRegionVertexService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
|
@ -102,4 +102,9 @@ public class CuMemberRetailRegionExt extends CuMemberRetailRegion {
|
||||||
* 2025年6月11日 是否激活 (0-是, 1-否)
|
* 2025年6月11日 是否激活 (0-是, 1-否)
|
||||||
*/
|
*/
|
||||||
private Integer isActivate;
|
private Integer isActivate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 2025年6月30日 区域体系分组名称
|
||||||
|
*/
|
||||||
|
private String regionVertexName;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue