From 2e5ec4c7c528437a20fd7212096dedd26ed0f5cd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 九月 2025 15:36:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java | 94 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
index c939fb2..6788fee 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java
@@ -1,8 +1,24 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.dto.TCrmBranchDTO;
+import com.ruoyi.system.model.TCrmBranch;
+import com.ruoyi.system.model.TErpGoods;
+import com.ruoyi.system.query.TCrmBranchQuery;
+import com.ruoyi.system.service.TCrmBranchService;
+import com.ruoyi.system.vo.TCrmBranchVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* <p>
@@ -12,9 +28,83 @@
* @author xiaochen
* @since 2025-08-20
*/
+@Api(tags = "crm分公司管理")
@RestController
@RequestMapping("/t-crm-branch")
public class TCrmBranchController {
+ private final TCrmBranchService crmBranchService;
+ @Autowired
+ public TCrmBranchController(TCrmBranchService crmBranchService) {
+ this.crmBranchService = crmBranchService;
+ }
+
+ /**
+ * 获取crm分公司管理管理列表
+ */
+ @ApiOperation(value = "获取crm分公司管理分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TCrmBranchVO>> pageList(@RequestBody TCrmBranchQuery query) {
+ return R.ok(crmBranchService.pageList(query));
+ }
+
+ /**
+ * 获取crm分公司管理管理列表
+ */
+ @ApiOperation(value = "获取crm分公司管理列表")
+ @PostMapping(value = "/list")
+ public R<List<TCrmBranch>> list() {
+ return R.ok(crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class).orderByDesc(TCrmBranch::getCreateTime)));
+ }
+
+ /**
+ * 添加crm分公司管理管理
+ */
+ @Log(title = "crm分公司管理信息-新增crm分公司管理", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加crm分公司管理")
+ @PostMapping(value = "/add")
+ public R<Boolean> add(@Validated @RequestBody TCrmBranchDTO dto) {
+ return crmBranchService.add(dto);
+ }
+
+ /**
+ * 修改crm分公司管理
+ */
+ @Log(title = "crm分公司管理信息-修改crm分公司管理", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改crm分公司管理")
+ @PostMapping(value = "/update")
+ public R<Boolean> update(@Validated @RequestBody TCrmBranch dto) {
+ return R.ok(crmBranchService.updateById(dto));
+ }
+
+ /**
+ * 查看crm分公司管理详情
+ */
+ @ApiOperation(value = "查看crm分公司管理详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TCrmBranch> getDetailById(@RequestParam String id) {
+ return R.ok(crmBranchService.getById(id));
+ }
+
+ /**
+ * 删除crm分公司管理
+ */
+ @Log(title = "crm分公司管理信息-删除crm分公司管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除crm分公司管理")
+ @DeleteMapping(value = "/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ return R.ok(crmBranchService.removeById(id));
+ }
+
+ /**
+ * 批量删除crm分公司管理
+ */
+ @Log(title = "crm分公司管理信息-删除crm分公司管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除crm分公司管理")
+ @DeleteMapping(value = "/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ return R.ok(crmBranchService.removeByIds(ids));
+ }
+
}
--
Gitblit v1.7.1