From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
index e9a28d6..c58bb50 100644
--- a/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
+++ b/src/main/java/org/springblade/modules/property/controller/PropertyCompanyController.java
@@ -28,6 +28,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
@@ -35,6 +36,8 @@
import org.springblade.modules.property.wrapper.PropertyCompanyWrapper;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.core.boot.ctrl.BladeController;
+
+import java.util.List;
/**
* 物业公司 控制器
@@ -46,7 +49,7 @@
@AllArgsConstructor
@RequestMapping("blade-propertyCompany/propertyCompany")
@Api(value = "物业公司", tags = "物业公司接口")
-public class PropertyCompanyController extends BladeController {
+public class PropertyCompanyController {
private final IPropertyCompanyService propertyCompanyService;
@@ -83,6 +86,14 @@
}
/**
+ * 物业公司列表查询（不分页）
+ */
+ @GetMapping("/getPropertyCompanyList")
+ public R getPropertyCompanyList(PropertyCompanyVO propertyCompany) {
+ return R.data(propertyCompanyService.getPropertyCompanyList(propertyCompany));
+ }
+
+ /**
* 物业公司 新增
*/
@PostMapping("/save")
@@ -113,13 +124,30 @@
}
/**
+ * 物业公司 自定义新增或修改
+ */
+ @PostMapping("/saveOrUpdate")
+ public R saveOrUpdate(@Valid @RequestBody PropertyCompanyEntity propertyCompany) {
+ return R.status(propertyCompanyService.saveOrUpdatePropertyCompany(propertyCompany));
+ }
+
+ /**
* 物业公司 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(propertyCompanyService.deleteLogic(Func.toLongList(ids)));
+ List<Integer> toIntList = Func.toIntList(ids);
+ return R.status(propertyCompanyService.deleteByIds(toIntList));
+ }
+
+ /**
+ * 物业公司查询对应的用户信息
+ */
+ @GetMapping("/getUserByPropertyCompany")
+ public R getUserByPropertyCompany(PropertyCompanyVO propertyCompany) {
+ return R.data(propertyCompanyService.getUserByPropertyCompany(propertyCompany));
}
--
Gitblit v1.9.3