From 73da7b6d6a2a91d836bddcdf956a8473534d3bbf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 23 Feb 2024 17:31:34 +0800
Subject: [PATCH] 场所完善状态调整（身份证号码）
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index 94b511e..a15befb 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -73,22 +73,59 @@
<if test="place.isPerfect==2">
and jp.status = 2
</if>
- <if test="houseCodeList != null and houseCodeList.size()>0">
- and jp.house_code in
- <foreach collection="houseCodeList" item="houseCode" separator ="," open="(" close=")">
- #{houseCode}
- </foreach>
- </if>
<if test="isAdministrator==2">
<choose>
- <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
- and jg.grid_code in
- <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
- #{code}
- </foreach>
+ <when test="place.roleName != null and place.roleName != ''">
+ <if test="place.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jp.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jp.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="place.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jpag.community_code in ('')
+ </otherwise>
+ </choose>
+ </if>
</when>
<otherwise>
- and jg.grid_code in ('')
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jg.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ or
+ jpag.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+ and
+ (
+ jg.grid_code in ('') or jpag.community_code in ('')
+ )
+ </otherwise>
+ </choose>
</otherwise>
</choose>
</if>
@@ -152,6 +189,10 @@
</if>
<if test="place.isFront!=null and place.isFront!=''">
and jp.is_front = #{place.isFront}
+ </if>
+
+ <if test="place.frontType!=null and place.frontType!=''">
+ and jp.front_type = #{place.frontType}
</if>
<if test="place.neiName!=null and place.neiName!=''">
@@ -476,7 +517,7 @@
jpe.confirm_flag confirmFlag,
bus.`name` AS policeName,
bus.phone AS policePhone,
- jp.location addressName,
+ jp.location as addressName,
jpag.pcs_name deptName
from jczz_place jp
left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
@@ -515,18 +556,20 @@
<if test="place.policeName!=null and place.policeName!=''">
and bus.name like concat('%',#{place.policeName},'%')
</if>
-
<if test="nineTypeList!=null and nineTypeList.size()>0">
and jp.nine_type in
<foreach collection="nineTypeList" separator="," open="(" close=")" item="nineType">
#{nineType}
</foreach>
</if>
-
<if test="place.isFront!=null and place.isFront!=''">
and jp.is_front = #{place.isFront}
</if>
+ <if test="place.frontType!=null and place.frontType!=''">
+ and jp.front_type = #{place.frontType}
+ </if>
+
<if test="place.neiName!=null and place.neiName!=''">
and br.name like concat('%',#{place.neiName},'%')
</if>
--
Gitblit v1.9.3