From 5a5b01fa9824a42e3eb033088a20e24c32b30dda Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期六, 17 八月 2024 16:17:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java index a46d44d..f11efbe 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java @@ -1,8 +1,17 @@ package com.ruoyi.other.controller; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.other.api.domain.TEnterpriseUserApplication; +import com.ruoyi.other.service.TEnterpriseUserApplicationService; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; /** @@ -17,5 +26,30 @@ @RequestMapping("/t-enterprise-user-application") public class TEnterpriseUserApplicationController { + private final TEnterpriseUserApplicationService enterpriseUserApplicationService; + + @Autowired + public TEnterpriseUserApplicationController(TEnterpriseUserApplicationService enterpriseUserApplicationService) { + this.enterpriseUserApplicationService = enterpriseUserApplicationService; + } + + /** + * 添加计费策略管理 + */ + @Log(title = "添加集团用户申请", businessType = BusinessType.INSERT) + @ApiOperation(tags = {"小程序-计费策略"},value = "添加集团用户申请") + @PostMapping(value = "/add") + public AjaxResult<Boolean> add(@Validated @RequestBody TEnterpriseUserApplication dto) { + // TODO 用户id + return AjaxResult.ok(enterpriseUserApplicationService.save(dto)); + } + + @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "集团用户列表") + @PostMapping(value = "/page") + public AjaxResult<Boolean> page(@RequestBody TEnterpriseUserApplication dto) { + // TODO 用户id + return AjaxResult.ok(enterpriseUserApplicationService.save(dto)); + } + } -- Gitblit v1.7.1