From 181cbe8a1b027903dd5295b28fe2d77bad11b9cd Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 07 Nov 2023 17:58:02 +0800
Subject: [PATCH] 场所查询修改，实体类字段调整
---
src/main/java/org/springblade/modules/place/entity/PlaceEntity.java | 3 ++-
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java | 2 +-
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 4 ++--
src/main/java/org/springblade/modules/place/vo/PlaceVO.java | 5 +++++
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 25 ++++++++++++++++++++++++-
5 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
index af18982..1008970 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -69,7 +69,8 @@
* 场所负责人（关联用户表信息）
*/
@ApiModelProperty(value = "场所负责人（关联用户表信息）")
- private String principal;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long principalUserId;
/**
* 场所名称
*/
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
index d8db28a..1ff5ce3 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -39,7 +39,7 @@
* @param place
* @return
*/
- List<PlaceVO> selectPlacePage(IPage page, PlaceVO place);
+ List<PlaceVO> selectPlacePage(IPage page, @Param("place") PlaceVO place);
/**
* 查询场所集合信息
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 e8d3fda..6c4b220 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -4,7 +4,30 @@
<!--自定义分页查询-->
<select id="selectPlacePage" resultType="org.springblade.modules.place.vo.PlaceVO">
- select * from jczz_place where is_deleted = 0
+ select jp.*,bu.real_name as username,bu.phone as phone from jczz_place jp
+ left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
+ left join jczz_place_poi_label jppl on jppl.place_id = jp.id
+ where jp.is_deleted = 0
+ <if test="place.placeName!=null and place.placeName!=''">
+ and jp.place_name like concat('%',#{place.placeName},'%')
+ </if>
+ <if test="place.isPerfect==1">
+ and
+ (
+ jp.place_name is null
+ or jp.image_urls is null
+ or jppl.poi_code is not null
+ or bu.real_name is null
+ or bu.phone is null
+ )
+ </if>
+ <if test="place.isPerfect==2">
+ and jp.place_name != ""
+ and jp.image_urls != ""
+ and jppl.poi_code is not null
+ and bu.real_name != ""
+ and bu.phone != ""
+ </if>
</select>
<!--查询场所集合信息-->
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 5328cb8..ef7a4a3 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -80,7 +80,7 @@
if (user != null){
//如果用户存在，则该用户id绑定场所
- placeVO.setPrincipal(user.getId().toString());
+ placeVO.setPrincipalUserId(user.getId());
}else{
//如果用户不存在，则新增一个用户
User newUser = new User();
@@ -94,7 +94,7 @@
userService.submit(newUser);
//绑定id
- placeVO.setPrincipal(newUser.getId().toString());
+ placeVO.setPrincipalUserId(newUser.getId());
}
boolean save = save(placeVO);
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
index 3dffbae..bd74706 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -44,5 +44,10 @@
*/
private String createUserName;
+ /**
+ * 1: 待完善 2：已完善
+ */
+ private Integer isPerfect;
+
}
--
Gitblit v1.9.3