From 5ade6f6e4532b65b96d80eabe5d92302f6f817f4 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 13:50:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
index 4c01f93..4721989 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComMngVillageApi.java
@@ -2,7 +2,6 @@
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.service_community.service.ComMngVillageService;
@@ -71,15 +70,28 @@
return R.ok(r);
}
+
/**
* 社区后台导入实有房屋
- * @param list 车辆列表
+ * @param list 数据
* @param communityId 社区编号
* @return
*/
@PostMapping("/village/import")
- public R listSaveMngCarExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam("communityId") Long communityId){
+ @Transactional(rollbackFor = Exception.class)
+ public R listSaveMngCarExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
return comMngVillageService.listSaveVillage(list,communityId);
}
+
+ /**
+ * 编辑实有房屋
+ * @param villageId 动态id
+ * @return 删除结果
+ */
+ @PostMapping("editvillage/{villageId}")
+ @Transactional(rollbackFor = Exception.class)
+ public R editvillage(@PathVariable("villageId")Long villageId,@Valid @RequestBody ComMngVillageVO comMngVillageVO) {
+ return comMngVillageService.editVillage(villageId,comMngVillageVO);
+ }
}
--
Gitblit v1.7.1