From 88e7bb7f517bf1f0ec39ac257e35e485392d55d1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 04 Nov 2023 16:19:54 +0800
Subject: [PATCH] 房屋即房屋标签操作修改
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 31 ++++++++++++++++---------------
src/main/java/org/springblade/common/node/TreeNode.java | 2 +-
src/main/java/org/springblade/modules/house/controller/HouseLabelController.java | 14 ++++++++++++++
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 1 +
src/main/java/org/springblade/modules/house/entity/HouseEntity.java | 2 ++
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 3 ++-
src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java | 1 +
7 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/common/node/TreeNode.java b/src/main/java/org/springblade/common/node/TreeNode.java
index 9e5c8f2..366c0db 100644
--- a/src/main/java/org/springblade/common/node/TreeNode.java
+++ b/src/main/java/org/springblade/common/node/TreeNode.java
@@ -32,7 +32,7 @@
private String name;
/**
- * 地址类型 1：小区 2：非小区
+ * 地址类型 1：小区 2：非小区 3:街路巷
*/
private Integer addressType;
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index fafd2af..62fc194 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -155,7 +155,7 @@
<!--根据社区查询街路巷集合-->
<select id="getStreetRuList" resultType="org.springblade.common.node.TreeNode" >
- select street_ru_code as id,street_ru_name as name,2 as addressType from jczz_doorplate_address
+ select street_ru_code as id,street_ru_name as name,3 as addressType from jczz_doorplate_address
where 1=1
and aoi_code is null
<if test="name != null and name!=''">
@@ -169,24 +169,25 @@
<!--根据街路巷编号查询街路巷门牌名称集合-->
<select id="getDoorplateNameList" resultType="org.springblade.modules.doorplateAddress.vo.FuncNode">
- select address_code as addressCode,doorplate_name as houseNo from jczz_doorplate_address
- where 1=1
- and street_ru_code = #{code}
- and nei_code = #{name}
- and aoi_code is null
+ select address_code as addressCode,doorplate_name as floor from jczz_doorplate_address
+ where 1=1
+ and street_ru_code = #{code}
+ and nei_code = #{name}
+ and aoi_code is null
</select>
+
<select id="getDoorplateAddressDetail"
resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
-
- SELECT * FROM jczz_doorplate_address
- WHERE 1=1
- <if test="vo.stdId != null and vo.stdId != ''">
- AND address_code = #{vo.stdId}
- </if>
- <if test="vo.buildingCode != null and vo.buildingCode !='' ">
- AND building_code = #{vo.buildingCode}
- </if>
+ SELECT * FROM jczz_doorplate_address
+ WHERE 1=1
+ <if test="vo.stdId != null and vo.stdId != ''">
+ AND address_code = #{vo.stdId}
+ </if>
+ <if test="vo.buildingCode != null and vo.buildingCode !='' ">
+ AND building_code = #{vo.buildingCode}
+ </if>
</select>
+
<select id="getDoorplateAddressList"
resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
SELECT * FROM jczz_doorplate_address
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java b/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
index 0b1a16b..bbe1b9c 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseLabelController.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.house.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -133,5 +134,18 @@
return R.status(houseLabelService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 房屋-标签 自定义删除
+ */
+ @PostMapping("/removeHouseLabel")
+ @ApiOperationSupport(order = 7)
+ public R remove(@RequestBody HouseLabelEntity houseLabel) {
+ QueryWrapper<HouseLabelEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("label_id",houseLabel.getLabelId())
+ .eq("house_code",houseLabel.getHouseCode());
+ // 返回
+ return R.status(houseLabelService.remove(wrapper));
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
index d942832..3e9d292 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
@@ -92,6 +92,8 @@
* 服务到期
*/
@ApiModelProperty(value = "服务到期")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date serviceDue;
/**
* 楼层
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index 370bfd5..3c49f26 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -33,6 +33,7 @@
<collection property="houseLabelVOList" javaType="java.util.List"
ofType="org.springblade.modules.house.vo.HouseLabelVO" autoMapping="true">
<id property="id" column="cid"/>
+ <result property="remark" column="cremark"/>
</collection>
</resultMap>
@@ -45,7 +46,7 @@
<select id="getHouseDetail" resultMap="houseAndHouseLabelMap">
select
jh.*,
- jhl.id as cid,jhl.*
+ jhl.id as cid,jhl.*,jhl.remark as cremark
from jczz_house jh
left join jczz_house_label jhl on jh.house_code = jhl.house_code
where jh.is_deleted = 0
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
index 65ae716..f34961f 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
@@ -62,6 +62,7 @@
.eq("label_id",houseLabel.getLabelId());
HouseLabelEntity one = getOne(queryWrapper);
if (null != one){
+ houseLabel.setId(one.getId());
// 更新
return updateById(houseLabel);
}
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index a489ff1..8bd9ccc 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -64,6 +64,7 @@
wrapper.eq("house_code",house.getHouseCode());
HouseEntity one = getOne(wrapper);
if (null != one){
+ house.setId(one.getId());
// 更新数据
return updateById(house);
}
--
Gitblit v1.9.3