From d3772efff262c8079efbd301f39dc8c2695d752a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 30 Jan 2024 17:29:53 +0800
Subject: [PATCH] 九小场所优化
---
src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java | 27 +++++++++++++++++++++++++++
src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml | 6 ++++--
src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java | 2 ++
src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java | 11 +++++++++++
src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java | 2 ++
5 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
index eb34a83..09bd9f1 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceCheckMapper.xml
@@ -20,7 +20,7 @@
<result column="town_name" property="streetName"/>
<result column="village_name" property="communityName"/>
- <collection property="placePoiLabelVOList" column="id" javaType="java.util.List" select="selectPlacePoiLabelList"
+ <collection property="placePoiLabelVOList" column="jpid" javaType="java.util.List" select="selectPlacePoiLabelList"
ofType="org.springblade.modules.place.entity.PlacePoiLabel"
autoMapping="true">
</collection>
@@ -41,7 +41,7 @@
color,
remark
from
- jczz_place_poi_label where place_id = #{id}
+ jczz_place_poi_label where place_id = #{jpid}
</select>
@@ -66,6 +66,7 @@
<select id="selectPlaceCheckPage" resultMap="placeCheckResultMap">
SELECT
jpc.*,
+ jp.id jpid,
jp.place_name,
jp.location,
jg.grid_name,
@@ -138,6 +139,7 @@
<select id="selectPlaceCheckById" parameterType="long" resultMap="placeCheckResultMap">
SELECT
jpc.*,
+ jp.id jpid,
jp.place_name,
jp.location,
jg.grid_name,
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java
index 615288f..742566f 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java
@@ -90,4 +90,6 @@
@ApiModelProperty(value = "隐患数量", example = "")
private Integer number;
+ private Long jpid;
+
}
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
index 7df6cee..d19c399 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
@@ -187,4 +187,15 @@
public R getPayConfig(PropertyCompanyVO propertyCompany) {
return R.data(propertyCompanyService.getPayConfig(propertyCompany));
}
+
+ /**
+ * 物业公司 自定义详情查询
+ * @return
+ */
+ @GetMapping("/getDetailByDeptId")
+ @ApiOperationSupport(order = 10)
+ @ApiOperation(value = "通过用户id查询物业详情", notes = "传入propertyCompany")
+ public R<PropertyCompanyDetailVO> getDetailByUserId() {
+ return R.data(propertyCompanyService.getDetailByDeptId());
+ }
}
diff --git a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
index ecdb553..4d81ddf 100644
--- a/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
+++ b/src/main/java/org/springblade/modules/property/service/IPropertyCompanyService.java
@@ -79,4 +79,6 @@
Boolean payConfig(WxPayInfo wxPayInfo, AliPayInfo aliPayInfo);
PropertyCompanyDetailVO getPayConfig(PropertyCompanyVO propertyCompany);
+
+ PropertyCompanyDetailVO getDetailByDeptId();
}
diff --git a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
index bfbd74c..2b3c36d 100644
--- a/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/property/service/impl/PropertyCompanyServiceImpl.java
@@ -18,21 +18,27 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.pay.entity.AliPayInfo;
import org.springblade.modules.pay.entity.WxPayInfo;
import org.springblade.modules.pay.service.IAliPayService;
import org.springblade.modules.pay.service.IWxPayService;
+import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.mapper.PropertyCompanyMapper;
+import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
+import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springblade.modules.property.vo.PropertyCompanyDetailVO;
import org.springblade.modules.property.vo.PropertyCompanyVO;
import org.springblade.modules.system.entity.Dept;
@@ -45,7 +51,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 物业公司 服务实现类
@@ -212,4 +220,23 @@
return detail;
}
+
+ /**
+ * 通过用户机构查询
+ *
+ * @return
+ */
+ @Override
+ public PropertyCompanyDetailVO getDetailByDeptId() {
+ String userRole = AuthUtil.getUserRole();
+ if (userRole.contains("wygly")) {
+ // 通过用户机构查询用户的物业公司
+ IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
+ PropertyCompanyEntity propertyCompanyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ if (propertyCompanyEntity != null) {
+ return baseMapper.getDetail(BeanUtil.copyProperties(propertyCompanyEntity, PropertyCompanyVO.class));
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3