From 04f0cbecdfbe00e9c5f111371c37a642a9f8b022 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 9 May 2023 14:43:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0=E5=88=AB?= =?UTF-8?q?=E5=90=8D=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/bkoff/controllers/DistrictController.java | 8 +++++++- projects/fangjia-bkoff/src/main/webapp/district/add.ftl | 2 +- projects/fangjia-bkoff/src/main/webapp/district/edit.ftl | 2 +- .../fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java index 43a11fc70..d9d690a64 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DistrictController.java @@ -2017,7 +2017,13 @@ public class DistrictController { District distTask = new District(); distTask.setCity(orgDis.getCity()); distTask.setRegion(newRegion); - distTask.setName(newName); + distTask.setEstateType2(orgDis.getEstateType2()); + if(StringUtils.isNotBlank(newName)){ + distTask.setName(newName); + }else{ + distTask.setName(orgDis.getName()); + } + districtUpdateTaskService.createTask(distTask, 5); } diff --git a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl index 8e659db8e..98b9daf40 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl @@ -365,7 +365,7 @@ - 小区性质 + 权属类别 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java index 416082c70..bbd3aec67 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/DistrictUpdateTaskDaoImpl.java @@ -94,6 +94,11 @@ public class DistrictUpdateTaskDaoImpl extends MongoDaoImpl task.setCreateDate(new Date()); task.setStatus(5); task.setName(district.getName()); + if(district.getEstateType2().contains("±ðÊû")){ + task.setEstateType("villa"); + }else{ + task.setEstateType("district"); + } this.save(task); }