From a95a045a631993c7f89ee87f0a8f4a57b4a21efc Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 13 May 2024 14:08:41 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java | 13 ++++--
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java | 6 ++
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 2 -
src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java | 10 +++++
src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml | 35 +++++++++++++++++
5 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
index b8a3505..1d64b05 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.java
@@ -39,7 +39,11 @@
* @param placePractitioner
* @return
*/
- List<PlacePractitionerVO> selectPlacePractitionerPage(IPage page,@Param("placePractitioner") PlacePractitionerVO placePractitioner);
+ List<PlacePractitionerVO> selectPlacePractitionerPage(IPage page,
+ @Param("placePractitioner") PlacePractitionerVO placePractitioner,
+ @Param("gridCodeList") List<String> gridCodeList,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 统计数据
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
index db7a0ef..17d99c3 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlacePractitionerMapper.xml
@@ -33,6 +33,7 @@
LEFT JOIN jczz_place jp ON jp.id = jpp.place_id
LEFT JOIN jczz_place_poi_label jppl on jppl.place_id = jp.id and type = 3
LEFT JOIN jczz_category jc on jc.category_no = jppl.poi_code
+ LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
<where>
<if test="placePractitioner.id != null ">and jpp.id = #{placePractitioner.id}</if>
<if test="placePractitioner.placeId != null ">and jpp.place_id = #{placePractitioner.placeId}</if>
@@ -42,7 +43,6 @@
</if>
<if test="placePractitioner.telephone != null and placePractitioner.telephone != ''">and jpp.telephone like
concat('%', #{placePractitioner.telephone},'%')
-
</if>
<if test="placePractitioner.tempAddress != null and placePractitioner.tempAddress != ''">and
jpp.temp_address =
@@ -82,6 +82,39 @@
and (TIMESTAMPDIFF(year, substring(jpp.id_card, 7, 8), now()) < 18 or jpp.ethnicity != 1)
and jc.category_no in (180202,180201,180200)
</if>
+
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="placePractitioner.roleName != null and placePractitioner.roleName != ''">
+ <if test="placePractitioner.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="placePractitioner.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>
+ </choose>
+ </if>
and jpp.is_deleted = 0
order by jpp.id desc
</where>
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java
index 520d013..d2a0b38 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlacePractitionerServiceImpl.java
@@ -16,20 +16,21 @@
*/
package org.springblade.modules.place.service.impl;
+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.constant.CommonConstant;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
-import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springblade.modules.place.mapper.PlacePractitionerMapper;
import org.springblade.modules.place.service.IPlacePractitionerService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.place.vo.PlacePractitionerVO;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -43,7 +44,11 @@
@Override
public IPage<PlacePractitionerVO> selectPlacePractitionerPage(IPage<PlacePractitionerVO> page, PlacePractitionerVO placePractitioner) {
- return page.setRecords(baseMapper.selectPlacePractitionerPage(page, placePractitioner));
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(PlacePractitionerVO.class, placePractitioner);
+ List<PlacePractitionerVO> placePractitionerVOS = baseMapper.selectPlacePractitionerPage(page, placePractitioner,commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator());
+ return page.setRecords(placePractitionerVOS);
}
diff --git a/src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java b/src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java
index 450c211..829f3c4 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlacePractitionerVO.java
@@ -45,4 +45,14 @@
*/
private String employer;
+ /**
+ * 社区编号
+ */
+ private String communityCode;
+
+ /**
+ * 角色名称
+ */
+ private String roleName;
+
}
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index bbfb817..1950ef4 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -284,8 +284,6 @@
commonParamSet.getIsAdministrator(), commonParamSet.getGridCodeList());
ITaskSchoolEvenService taskSchoolEvenService = SpringUtils.getBean(ITaskSchoolEvenService.class);
TaskSchoolEvenVO taskSchoolEvenVO = new TaskSchoolEvenVO();
-// taskSchoolEvenVO.setIsReporting(CommonConstant.NUMBER_ONE.toString());
-// taskSchoolEvenVO.setIsHandle(CommonConstant.NUMBER_TWO.toString());
taskSchoolEvenVO.setConfirmFlag(CommonConstant.NUMBER_ONE.toString());
taskSchoolEvenVO.setType(CommonConstant.NUMBER_ONE.toString());
// 校园隐患
--
Gitblit v1.9.3