From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 3 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 ed8f9ac..1f64cf3 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
@@ -6,11 +6,13 @@
 import com.doumee.core.model.ApiResponse;
 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;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;    
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
@@ -20,7 +22,7 @@
 
 /**
  * @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
  */
 @Api(tags = "浼佷笟淇℃伅琛�")
 @RestController
@@ -36,6 +38,14 @@
     @RequiresPermissions("business:company:create")
     public ApiResponse create(@RequestBody Company company) {
         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鍒犻櫎")
@@ -63,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);
     }
 
@@ -72,6 +82,15 @@
     @RequiresPermissions("business:company:query")
     public ApiResponse<PageData<Company>> findPage (@RequestBody PageWrap<Company> pageWrap) {
         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")
@@ -87,4 +106,38 @@
     public ApiResponse findById(@PathVariable Integer id) {
         return ApiResponse.success(companyService.findById(id));
     }
+
+    @ApiOperation("鏍规嵁鍒嗙被ID鏌ヨ")
+    @PostMapping("/findLaborServicesList")
+    @RequiresPermissions("business:company:query")
+    public ApiResponse<List<Company>> findLaborServicesList(Company query){
+        Company company = new Company();
+        company.setIsdeleted(Constants.ZERO);
+        company.setType(query.getType());
+        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));
+    }
+
+
+
+    @ApiOperation("閮ㄩ棬淇℃伅鍚屾")
+    @PostMapping("/sync")
+//    @RequiresPermissions("business:company:sync")
+    public ApiResponse sync(){
+        //TODO 鎵嬪姩鍚屾 閮ㄩ棬淇℃伅
+        return ApiResponse.success("鍚屾鎴愬姛");
+    }
 }

--
Gitblit v1.9.3