From 3a5ea5a84c338e0cb7a942e03a98e883a0b23115 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 07 Feb 2024 10:34:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java | 43 ++++++++++++---------
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml | 8 +--
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 6 ++-
src/main/java/org/springblade/modules/task/vo/TaskVO.java | 4 ++
src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java | 3 +
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 22 ++++++----
6 files changed, 51 insertions(+), 35 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 101b1c1..7da6da5 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -103,17 +103,15 @@
bu.real_name as username,bu.phone as phone,
br.town_name as townStreetName,br.name as neiName,
jpe.confirm_flag confirmFlag,
- jg.grid_name as gridName,
bus.`name` AS policeName,
bus.phone AS policePhone,
- jda.address_name,
+ IFNULL(jda.address_name,jp.location) addressName,
jpag.pcs_name deptName
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_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
- left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- left join blade_region br on br.code = jg.community_code
LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ left join blade_region br on br.code = jpag.community_code
LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
@@ -149,6 +147,10 @@
<if test="place.nineType!=null and place.nineType!=''">
and jp.nine_type = #{place.nineType}
+ </if>
+
+ <if test="place.isFront!=null and place.isFront!=''">
+ and jp.is_front = #{place.isFront}
</if>
<if test="place.neiName!=null and place.neiName!=''">
@@ -431,17 +433,15 @@
bu.real_name as username,bu.phone as phone,
br.town_name as townStreetName,br.name as neiName,
jpe.confirm_flag confirmFlag,
- jg.grid_name as gridName,
bus.`name` AS policeName,
bus.phone AS policePhone,
- jda.address_name,
+ IFNULL(jda.address_name,jp.location) addressName,
jpag.pcs_name deptName
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_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
- left join jczz_grid jg on jg.grid_code = jp.grid_code and jg.is_deleted = 0
- left join blade_region br on br.code = jg.community_code
LEFT JOIN jczz_police_affairs_grid jpag on jp.jw_grid_code= jpag.jw_grid_code
+ left join blade_region br on br.code = jpag.community_code
LEFT JOIN blade_user bus on bus.id = jpag.police_user_id
LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
@@ -468,7 +468,7 @@
and br.town_name like concat('%',#{place.townStreetName},'%')
</if>
<if test="place.deptName!=null and place.deptName!=''">
- and bd.dept_name like concat('%',#{place.deptName},'%')
+ and jpag.pcs_name like concat('%',#{place.deptName},'%')
</if>
<if test="place.policeName!=null and place.policeName!=''">
@@ -479,6 +479,10 @@
and jp.nine_type = #{place.nineType}
</if>
+ <if test="place.isFront!=null and place.isFront!=''">
+ and jp.is_front = #{place.isFront}
+ </if>
+
<if test="place.neiName!=null and place.neiName!=''">
and br.name like concat('%',#{place.neiName},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 931e37b..e3e6cfc 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -29,6 +29,8 @@
br.town_code streetCode,
jp.principal as realName,
jp.principal_phone as phone,
+ jp.nine_type ,
+ jp.front_type ,
jt.id,
jt.NAME,
jt.type,
@@ -147,8 +149,8 @@
AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
</if>
<!-- 场所店铺 -->
- <if test="task.reportType != null and task.reportType == 2 ">
- and jt.report_type in (2,3,4,5,6,7,8)
+ <if test="task.reportType != null">
+ and jt.report_type = #{task.reportType}
</if>
<if test="task.reportType == null">
and jt.report_type in (2,3,4,5,6,7,8)
diff --git a/src/main/java/org/springblade/modules/task/vo/TaskVO.java b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
index e2df71e..dd6dd24 100644
--- a/src/main/java/org/springblade/modules/task/vo/TaskVO.java
+++ b/src/main/java/org/springblade/modules/task/vo/TaskVO.java
@@ -66,4 +66,8 @@
*/
private String roleName;
+ private String nineType;
+
+ private String frontType;
+
}
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java b/src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java
index 9d7798f..c127f49 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/excel/PlaceRectificationsExcel.java
@@ -23,6 +23,9 @@
@ExcelProperty(value = "场所名称")
private String placeName;
+ @ExcelProperty(value = "社区名称")
+ private String communityName;
+
@ExcelProperty(value = "场所地址")
private String placeAddress;
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
index ae63930..8a8a47c 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -397,7 +397,6 @@
<select id="export"
resultMap="TaskPlaceRectificationExcelResult">
-
SELECT
jtpr.id,
jtpr.place_check_id,
@@ -516,7 +515,7 @@
#{code}
</foreach>
or
- jpag.community_code in
+ br.village_code in
<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
@@ -525,14 +524,13 @@
<otherwise>
and
(
- jg.grid_code in ('') or jpag.community_code in ('')
+ jg.grid_code in ('') or br.village_code in ('')
)
</otherwise>
</choose>
</if>
</where>
-
-
+ order by jtpr.create_time desc
</select>
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java b/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
index 76f3fac..b5081aa 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java
@@ -17,9 +17,9 @@
package org.springblade.modules.taskPlaceRectification.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.lettuce.core.ScriptOutputType;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
@@ -27,20 +27,17 @@
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
-import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.patrol.entity.PatrolRecord;
import org.springblade.modules.patrol.service.IPatrolRecordService;
import org.springblade.modules.patrol.vo.PatrolRecordVO;
-import org.springblade.modules.place.entity.PlaceCheckEntity;
import org.springblade.modules.place.entity.PlaceEntity;
-import org.springblade.modules.place.excel.NinePlaceExcel;
-import org.springblade.modules.place.service.IPlaceCheckService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
+import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
@@ -51,13 +48,11 @@
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import org.springblade.modules.taskPlaceRectification.excel.PlaceRectificationsExcel;
import org.springblade.modules.taskPlaceRectification.excel.TaskPlaceRectificationExcel;
-import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.taskPlaceRectification.mapper.TaskPlaceRectificationMapper;
import org.springblade.modules.taskPlaceRectification.service.ITaskPlaceRectificationService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationVO;
import org.springblade.modules.taskPlaceRectification.vo.TaskPlaceRectificationsVO;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.ArrayList;
import java.util.List;
@@ -172,8 +167,8 @@
@Override
public List<TaskPlaceRectificationExcel> export(TaskPlaceRectificationsVO taskPlaceRectificationVO) {
// todo
- List<String> regionChildCodesList = new ArrayList<>();//SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdmin() == true ? 1 : 2;
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
List<TaskPlaceRectificationExcel> export = baseMapper.export(taskPlaceRectificationVO, regionChildCodesList, isAdministrator);
IDictBizService bean = SpringUtils.getBean(IDictBizService.class);
List<DictBiz> nineType = bean.list(Wrappers.<DictBiz>lambdaQuery().eq(DictBiz::getCode, "nineType").eq(DictBiz::getIsDeleted, 0));
@@ -216,9 +211,9 @@
public void importPlaceRectifications(List<PlaceRectificationsExcel> data, Boolean isCovered) {
IPlaceService bean = SpringUtils.getBean(IPlaceService.class);
IUserService bean1 = SpringUtils.getBean(IUserService.class);
- IPlaceCheckService bean2 = SpringUtils.getBean(IPlaceCheckService.class);
IDoorplateAddressService bean3 = SpringUtils.getBean(IDoorplateAddressService.class);
IPlaceService bean4 = SpringUtils.getBean(IPlaceService.class);
+ IPoliceAffairsGridService policeAffairsGridService = SpringUtils.getBean(IPoliceAffairsGridService.class);
List<String> objects = new ArrayList<>();
List<String> objects2 = new ArrayList<>();
@@ -240,29 +235,33 @@
// 新增场所
DoorplateAddressEntity doorplateAddressEntity = bean3.getOne(Wrappers.<DoorplateAddressEntity>lambdaQuery()
.eq(DoorplateAddressEntity::getAddressCode, datum.getHouseCode()));
- if (doorplateAddressEntity == null) {
+ if (doorplateAddressEntity != null) {
objects.add(datum.getHouseCode());
continue;
} else {
+ PoliceAffairsGridEntity one1 = policeAffairsGridService.getOne(Wrappers.<PoliceAffairsGridEntity>lambdaQuery()
+ .like(PoliceAffairsGridEntity::getCommunityName, datum.getCommunityName()).last("limit 1"));
+ if (one1 == null) {
+ continue;
+ }
PlaceVO placeVO = new PlaceVO();
+ placeVO.setJwGridCode(one1.getJwGridCode());
placeVO.setHouseCode(datum.getHouseCode());
placeVO.setIsNine(1);
placeVO.setPrincipal(StringUtils.isBlank(datum.getPrincipal().trim()) ? "demo" : datum.getPrincipal().trim());
placeVO.setPrincipalPhone(datum.getPrincipalPhone());
placeVO.setRoleName("民警");
- placeVO.setBuildingCode(doorplateAddressEntity.getBuildingCode());
- placeVO.setLat(doorplateAddressEntity.getY());
- placeVO.setLng(doorplateAddressEntity.getX());
- placeVO.setLocation(datum.getAddressName());
- placeVO.setSource(1);
+ placeVO.setLocation(datum.getPlaceAddress());
+ placeVO.setSource(2);
placeVO.setIsScene(1);
placeVO.setIsNine(1);
+ placeVO.setPlaceName(datum.getPlaceName());
if (StringUtils.isNotBlank(datum.getNineType())) {
placeVO.setNineType(Integer.valueOf(datum.getNineType()));
}
Boolean aBoolean = bean4.addOrUpdate(placeVO);
-
objects2.add(datum.getHouseCode());
+ continue;
}
}
// 2.判断负责人电话是否存在
@@ -328,6 +327,9 @@
private String getPhone(String text) {
+ if (StringUtils.isBlank(text)) {
+ return "";
+ }
Pattern pattern = Pattern.compile("1[3-9]\\d{9}");
Matcher matcher = pattern.matcher(text);
@@ -338,6 +340,9 @@
}
private String getName(String text) {
+ if (StringUtils.isBlank(text)) {
+ return "";
+ }
// Pattern pattern = Pattern.compile("[\\\\u4e00-\\\\u9fa5]+");
// Matcher matcher = pattern.matcher(text);
--
Gitblit v1.9.3