From c5d81c278087202067bcffc487b2fcc1e6f17699 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 4 Nov 2021 16:00:59 +0800
Subject: [PATCH] bug#2306

---
 .../com/epmet/dto/form/IcPropertyManagementFormDTO.java    | 2 +-
 .../com/epmet/controller/PropertyManagementController.java | 7 +++++--
 .../java/com/epmet/service/PropertyManagementService.java  | 7 +------
 .../epmet/service/impl/PropertyManagementServiceImpl.java  | 3 ++-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java
index ae5f2f9903..cd05a2a13d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java
@@ -43,7 +43,7 @@ public class IcPropertyManagementFormDTO implements Serializable {
      * 物业名称
      */
     @NotBlank(message = "物业名称不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    @Length(max=10,message = "物业名称不能超过100个字", groups = {AddGroup.class, UpdateGroup.class})
+    @Length(max=50,message = "物业名称不能超过50个字", groups = {AddGroup.class, UpdateGroup.class})
 	private String name;
 
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java
index 6d35f9af68..d97e1300e1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java
@@ -33,7 +33,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -63,8 +65,9 @@ public class PropertyManagementController {
     public Result add(@LoginUser TokenDto tokenDTO, @RequestBody IcPropertyManagementFormDTO formDTO){
         //效验数据
         ValidatorUtils.validateEntity(formDTO, AddGroup.class);
-        propertyManagementService.add(formDTO);
-        return new Result().ok("保存成功");
+        Map map=new HashMap<>();
+        map.put("propertyId",propertyManagementService.add(formDTO));
+        return new Result().ok(map);
     }
 
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java
index 5fe43468e9..7bbbad3616 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java
@@ -17,15 +17,10 @@
 
 package com.epmet.service;
 
-import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.IcPropertyManagementDTO;
 import com.epmet.dto.form.IcPropertyManagementFormDTO;
 import com.epmet.dto.result.IcPropertyManagementResultDTO;
-import com.epmet.entity.IcPropertyManagementEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 物业表
@@ -37,7 +32,7 @@ public interface PropertyManagementService  {
 
     List<IcPropertyManagementResultDTO> getList();
 
-    void add(IcPropertyManagementFormDTO formDTO);
+    String add(IcPropertyManagementFormDTO formDTO);
 
     void update(IcPropertyManagementFormDTO formDTO);
     void delete(IcPropertyManagementFormDTO formDTO);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
index 4068fb710d..258a48bd65 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java
@@ -43,9 +43,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void add(IcPropertyManagementFormDTO formDTO) {
+    public String add(IcPropertyManagementFormDTO formDTO) {
         IcPropertyManagementEntity icPropertyManagementEntity = ConvertUtils.sourceToTarget(formDTO, IcPropertyManagementEntity.class);
         icPropertyManagementDao.insert(icPropertyManagementEntity);
+        return icPropertyManagementEntity.getId();
     }
 
     @Override