From 39969f50f23ae92c5fc25005d8d367eea0570c31 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 十二月 2023 18:21:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
index 8f69c70..b3480ae 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.model.Company;
import com.doumee.service.business.CompanyService;
import io.swagger.annotations.Api;
@@ -39,6 +40,14 @@
return ApiResponse.success(companyService.create(company));
}
+ @PreventRepeat
+ @ApiOperation("鍒涘缓鍔冲姟鍏徃")
+ @PostMapping("/createLaborServices")
+ @RequiresPermissions("business:company:create")
+ public ApiResponse<Integer> createLaborServices(@RequestBody Company company){
+ return ApiResponse.success(companyService.createLaborServices(company));
+ }
+
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@RequiresPermissions("business:company:delete")
@@ -64,7 +73,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:company:update")
public ApiResponse updateById(@RequestBody Company company) {
- companyService.updateById(company);
+ companyService.updateLaborServicesById(company);
return ApiResponse.success(null);
}
@@ -75,6 +84,14 @@
return ApiResponse.success(companyService.findPage(pageWrap));
}
+
+ @ApiOperation("淇敼鐘舵��")
+ @PostMapping("/updateStatusById")
+ @RequiresPermissions("business:company:update")
+ public ApiResponse updateStatusById(@RequestBody Company company) {
+ companyService.updateStatusById(company);
+ return ApiResponse.success(null);
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:company:exportExcel")
@@ -99,4 +116,18 @@
company.setCategoryId(query.getCategoryId());
return ApiResponse.success(companyService.findList(company));
}
+
+
+ /**
+ * 鏌ヨ閮ㄩ棬鍙婂叾瀛愰儴闂ㄤ俊鎭�
+ * @param type 0 鏌ヨ鎵�鏈変俊鎭� 1 鏌ヨ鍐呴儴淇℃伅
+ * @return
+ */
+ @ApiOperation("鏍规嵁绫诲瀷鏌ヨ缁勭粐淇℃伅")
+ @GetMapping("/findCompanyTreePage")
+// @RequiresPermissions("business:company:query")
+ public ApiResponse<List<CompanyDTO>> findCompanyTreePage(Integer type){
+ return ApiResponse.success(companyService.findCompanyTreePage(type));
+ }
+
}
--
Gitblit v1.9.3