src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -307,7 +307,7 @@ jp.id as cid,jp.*,jp.create_time as pcreateTime, bu.real_name as createUserName FROM jczz_doorplate_address jda left join jczz_place jp on jda.address_code = jp.house_code and jp.is_deleted = 0 left join jczz_place jp on locate(jda.address_code,jp.house_code>0 and jp.is_deleted = 0 left join blade_user bu on bu.id = jp.create_user and bu.is_deleted = 0 WHERE 1=1 <if test="vo.stdId != null and vo.stdId != ''"> src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -53,7 +53,7 @@ left join blade_user bu on bu.id = jgm.user_id and bu.is_deleted = 0 left join blade_region br ON br.code = jg.community_code where jg.is_deleted = 0 and jp.house_code = #{houseCode} and jp.house_code like concat('%',#{houseCode},'%') limit 1 </select>
@@ -52,11 +52,6 @@ @ApiModelProperty(value = "绑定用户ID") private Long associatedUserId; /** * 绑定用户名称 */ @ApiModelProperty(value = "绑定用户名称") private String associatedUserName; /** * 角色 */ @ApiModelProperty(value = "角色") @@ -107,16 +102,6 @@ */ @ApiModelProperty(value = "证件号码") private String cardNo; /** * 港澳台通行证 */ @ApiModelProperty(value = "港澳台通行证") private String hkmtPass; /** * 护照 */ @ApiModelProperty(value = "护照") private String passport; /** * 民族 */ src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -129,6 +129,12 @@ private Integer source; /** * 是否现场采集 1：是 2：否 */ @ApiModelProperty(value = "是否现场采集 1：是 2：否") private Integer isScene; /** * 创建人 */ @JsonSerialize(using = ToStringSerializer.class) src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -44,7 +44,7 @@ and jpe.confirm_flag != 4 </if> <if test="placeExt.houseCode != null and placeExt.houseCode != ''"> and jp.house_code = #{placeExt.houseCode} and jp.house_code like concat('%',#{placeExt.houseCode},'%') </if> <if test="placeExt.confirmFlag != null"> and jpe.confirm_flag = #{placeExt.confirmFlag} @@ -67,8 +67,8 @@ count( 1 ) FROM jczz_place_ext jpe LEFT JOIN jczz_place jp ON jp.id = jpe.place_id LEFT JOIN jczz_doorplate_address jda ON jp.house_code = jda.address_code LEFT JOIN jczz_place jp ON jp.id = jpe.place_id and jp.is_deleted = 0 LEFT JOIN jczz_doorplate_address jda ON locate(jda.address_code,jp.house_code>0 <where> <if test="confirmFlag != null"> and jpe.confirm_flag = #{confirmFlag} src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -43,7 +43,7 @@ and jp.principal_phone like concat('%',#{place.principalPhone},'%') </if> <if test="place.houseCode!=null and place.houseCode!=''"> and jp.house_code = #{place.houseCode} and jp.house_code like concat('%',#{place.houseCode},'%') </if> <if test="place.townStreetName!=null and place.townStreetName!=''"> and br.town_name like concat('%',#{place.townStreetName},'%') @@ -145,7 +145,7 @@ left join blade_region br on br.code = jg.community_code where jp.is_deleted = 0 <if test="place.houseCode!=null and place.houseCode!=''"> and jp.house_code = #{place.houseCode} and jp.house_code like concat('%',#{place.houseCode},'%') </if> <if test="place.id!=null"> and jp.id = #{place.id} src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -129,4 +129,14 @@ */ private Integer gridId; /** * 经度 */ private String x; /** * 纬度 */ private String y; } src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -47,11 +47,11 @@ FROM jczz_task jt LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code LEFT JOIN jczz_place jp ON jp.house_code = jt.house_code LEFT JOIN blade_user bu on bu.id = jt.create_user LEFT JOIN jczz_place jp ON locate(jt.house_code,jp.house_code>0 and jp.is_deleted = 0 LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0 LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id LEFT JOIN jczz_community jc on jc.`code`= jg.community_code LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0 LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0 <where> <if test="task.userId != null and task.userId != ''"> AND jt.house_code IN ( @@ -261,12 +261,12 @@ FROM jczz_task jt LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code LEFT JOIN jczz_place jp ON jp.house_code = jt.house_code LEFT JOIN blade_user bu on bu.id = jt.create_user LEFT JOIN jczz_place jp ON locate(jt.house_code,jp.house_code>0 and jp.is_deleted = 0 LEFT JOIN blade_user bu on bu.id = jt.create_user and bu.is_deleted = 0 LEFT JOIN jczz_grid_range jgr on jgr.house_code= jt.house_code LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id LEFT JOIN jczz_community jc on jc.`code`= jg.community_code LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0 LEFT JOIN jczz_community jc on jc.`code`= jg.community_code and jc.is_deleted = 0 LEFT JOIN jczz_task_bail_reporting_event jtbre on jtbre.task_id = jt.id and jtbre.is_deleted = 0 <where> <if test="task.userId != null and task.userId != ''"> AND jt.house_code IN (
