From d2dd8f61b8c8c31212168dc770ecf6fd83716850 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 16:49:30 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/place/excel/NinePlaceExcel.java | 2 +-
src/main/java/org/springblade/modules/taskPlaceRectification/service/impl/TaskPlaceRectificationServiceImpl.java | 8 +++++++-
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 27 ++++++++++++++++++---------
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml | 13 ++++---------
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 4 ++--
6 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/excel/NinePlaceExcel.java b/src/main/java/org/springblade/modules/place/excel/NinePlaceExcel.java
index 7601f99..9859708 100644
--- a/src/main/java/org/springblade/modules/place/excel/NinePlaceExcel.java
+++ b/src/main/java/org/springblade/modules/place/excel/NinePlaceExcel.java
@@ -28,7 +28,7 @@
@ExcelProperty( "地区")
private String townStreetName;
- @ApiModelProperty(value = "场所名称")
+ @ExcelProperty(value = "场所名称")
private String placeName;
@ExcelProperty(value = "地址")
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 187979f..4c944fc 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -435,7 +435,7 @@
bus.`name` AS policeName,
bu.phone AS policePhone,
jda.address_name,
- bd.dept_name
+ 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
@@ -443,7 +443,7 @@
left join blade_region br on br.code = jg.community_code
LEFT JOIN jczz_community jc on jc.`code`=jg.community_code
LEFT JOIN blade_user bus on bus.id = jc.res_police_user_id
- LEFT JOIN blade_dept bd on bd.id = bus.dept_id
+ LEFT JOIN jczz_police_affairs_grid jpag on jpag.community_code= jg.community_code
LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
left join (
select a.* from jczz_place_poi_label a inner join
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 a4c881a..584d12f 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
@@ -206,15 +206,16 @@
/**
* 警务网格绑定
+ *
* @param placeVO
*/
public void jwGridCodeBind(PlaceVO placeVO) {
if (!Strings.isBlank(placeVO.getLng())) {
- String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() +")'";
+ String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() + ")'";
// 点落面警务网格
List<PoliceAffairsGridEntity> policeAffairsGridEntities
= SpringUtil.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
- if (policeAffairsGridEntities.size()>0){
+ if (policeAffairsGridEntities.size() > 0) {
// 设置警务网格并更新
placeVO.setJwGridCode(policeAffairsGridEntities.get(0).getJwGridCode());
}
@@ -223,14 +224,15 @@
/**
* 设置是否现场采集（1km 范围内）
+ *
* @param placeVO
*/
public void setIsScene(PlaceVO placeVO) {
- if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())){
+ if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())) {
Integer placeEntity = baseMapper.comparisonPosition(placeVO);
- if (placeEntity==1){
+ if (placeEntity == 1) {
placeVO.setIsScene(1);
- }else {
+ } else {
placeVO.setIsScene(2);
}
}
@@ -238,14 +240,15 @@
/**
* 设置是否现场采集（1km 范围内）,非地址总表数据
+ *
* @param placeVO
*/
public void setIsSceneNotHouseCode(PlaceVO placeVO) {
- if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())){
+ if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())) {
boolean flag = baseMapper.comparisonPositionNotHouseCode(placeVO);
- if (flag){
+ if (flag) {
placeVO.setIsScene(1);
- }else {
+ } else {
placeVO.setIsScene(2);
}
}
@@ -1217,7 +1220,13 @@
for (NinePlaceExcel ninePlaceExcel : aa) {
for (DictBiz dictBiz : nineType) {
if (StringUtils.isNotBlank(ninePlaceExcel.getNineType()) && ninePlaceExcel.getNineType().equals(dictBiz.getDictKey())) {
- ninePlaceExcel.setNineType(dictBiz.getDictValue());
+ if (ninePlaceExcel.getNineType().contains("10,11,12")) {
+ ninePlaceExcel.setNineType("小学校（幼儿园、校外培训机构）- " + dictBiz.getDictValue());
+ } else if (ninePlaceExcel.getNineType().contains("13,14,15")) {
+ ninePlaceExcel.setNineType("小医院（诊所、养老院）- " + dictBiz.getDictValue());
+ } else {
+ ninePlaceExcel.setNineType(dictBiz.getDictValue());
+ }
}
}
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
index 058eb22..5734262 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -126,7 +126,7 @@
roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
// 1:居民，居民需要通过人的标签来显示取保候审
if (CommonConstant.RESIDENT.equals(roleName)) {
- extracted(labelType, roleMenus);
+ // extracted(labelType, roleMenus);
}
}
// 顶部菜单请求返回对应角色权限菜单
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 204a577..a06ac8a 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/mapper/TaskPlaceRectificationMapper.xml
@@ -322,15 +322,12 @@
and jpr.state = '0'
and jp.nine_type = bd.dict_key
and br.town_code =#{code}
- and jpc.create_time=(
- SELECT MAX(create_time) FROM jczz_place_check where jpc.house_code=house_code
<if test="taskPlaceRectification.startTime!=null and taskPlaceRectification.startTime!=''">
and create_time>=#{taskPlaceRectification.startTime}
</if>
<if test="taskPlaceRectification.endTime!=null and taskPlaceRectification.endTime!=''">
and create_time<=#{taskPlaceRectification.endTime}
</if>
- )
</where>
) number
FROM
@@ -380,7 +377,7 @@
jtpr.signature_path,
jtpr.create_user,
jtpr.image_urls,
- bd.dept_name,
+ jpag.pcs_name deptName,
jp.id jpid,
jp.place_name,
jp.location,
@@ -401,8 +398,8 @@
LEFT JOIN blade_region br ON br.`code` = jg.community_code
LEFT JOIN jczz_place_ext jpe ON jpe.place_id = jp.id
LEFT JOIN blade_user bu ON bu.id = jtpr.create_user
- LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
- LEFT JOIN jczz_doorplate_address jda on jda.address_code=jp.house_code
+ LEFT JOIN jczz_doorplate_address jda on jda.address_code=jtpr.house_code
+ LEFT JOIN jczz_police_affairs_grid jpag on jpag.community_code= jg.community_code
<where>
<if test="taskPalce.id != null ">and id = #{taskPalce.id}</if>
<if test="taskPalce.placeCheckId != null ">and place_check_id = #{taskPalce.placeCheckId}</if>
@@ -471,9 +468,7 @@
</when>
</choose>
</if>
- and jtpr.create_time=(
- SELECT MAX(create_time) FROM jczz_task_place_rectification where jtpr.house_code=house_code
- )
+
</where>
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 c91ca58..f6ce5e5 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
@@ -163,7 +163,13 @@
for (TaskPlaceRectificationExcel taskPlaceRectificationExcel : export) {
for (DictBiz dictBiz : nineType) {
if (StringUtils.isNotBlank(taskPlaceRectificationExcel.getNineType()) && taskPlaceRectificationExcel.getNineType().equals(dictBiz.getDictKey())) {
- taskPlaceRectificationExcel.setNineType(dictBiz.getDictValue());
+ if (taskPlaceRectificationExcel.getNineType().contains("10,11,12")) {
+ taskPlaceRectificationExcel.setNineType("小学校（幼儿园、校外培训机构）- " + dictBiz.getDictValue());
+ } else if (taskPlaceRectificationExcel.getNineType().contains("13,14,15")) {
+ taskPlaceRectificationExcel.setNineType("小医院（诊所、养老院）- " + dictBiz.getDictValue());
+ } else {
+ taskPlaceRectificationExcel.setNineType(dictBiz.getDictValue());
+ }
}
}
if (taskPlaceRectificationExcel.getRectificationFlag().equals(1)) {
--
Gitblit v1.9.3