diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java index 85a14c7e6..6415212c7 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java @@ -110,6 +110,7 @@ public class DevelopmentZoneController { entity.setShape(shape); entity.setLevel(model.getLevel()); + entity.setAlias(model.getAlias()); entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress()); entity.setArea(StringUtils.isBlank(model.getArea()) ? "" : model.getArea()); entity.setBlock(StringUtils.isBlank(model.getBlock()) ? "" : model.getBlock()); @@ -162,7 +163,9 @@ public class DevelopmentZoneController { shape.put("coordinates", coordinates); udata.put("shape", shape); } - + if (StringUtils.isNotBlank(model.getAlias())) { + udata.put("alias", model.getAlias()); + } if (StringUtils.isNotBlank(model.getAddress())) { udata.put("address", model.getAddress()); } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java index a0e31ca10..5da4fb688 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java @@ -9,6 +9,15 @@ import java.util.Map; public class DevelopmentZoneModel extends BaseModel { private String id; + + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } + private String address; private String buildDate; private Date createTime; @@ -17,6 +26,7 @@ public class DevelopmentZoneModel extends BaseModel { private String level; private String name; + private String alias; private String nameEn; private String province; private String type; diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index 9207c07c6..12f59938e 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -33,6 +33,7 @@
| 名称 | +别名 | 开发区级别 | 省份 | 区块 | 是否有围栏 | -操作人员 | +操作人员 | +修改日期 | 操作 |
|---|---|---|---|---|---|---|---|---|---|
| ${it.name!} | +${it.alias!} | ${it.level!} | ${it.province!} | ${it.block!} | @@ -56,6 +59,7 @@ #if>${it.operator!} | +${it.createTime!?string("yyyy-MM-dd HH:mm:ss")} | 查看 新建围栏 diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/show.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/show.ftl index 0e0ffa361..4ec688cca 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/show.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/show.ftl @@ -39,6 +39,10 @@ | 名称 | ${developmentZone.name!} |
| 别名 | +${developmentZone.alias!} | +||||||||
| 区块 | ${developmentZone.block!} | diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java index 5e54b5eb6..55d0065c5 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java @@ -35,6 +35,9 @@ public class DevelopmentZone implements MongoEntity { private String cityName; private String district; + //Ôö¼ӱðÃû×ֶÎ + private String alias; + @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "_id") @@ -192,8 +195,14 @@ public class DevelopmentZone implements MongoEntity { this.cityName = cityName; } + @Column(name = "alias") + public String getAlias() { + return alias; + } - + public void setAlias(String alias) { + this.alias = alias; + } @Column(name = "district") public String getDistrict() {