From f4c9281d1b7f19fef0d8ee7cb03e166a218b33f2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:50:33 +0800
Subject: [PATCH] 完善功能
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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 4881695..6b744dc 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
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.EnterpriseQuery;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.common.core.domain.R;
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.common.security.service.TokenService;
import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
+import com.ruoyi.other.query.PassDto;
import com.ruoyi.other.service.TEnterpriseUserApplicationService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +47,7 @@
* 添加计费策略管理
*/
@Log(title = "添加集团用户申请", businessType = BusinessType.INSERT)
- @ApiOperation(tags = {"小程序-集团用户","后台-申请表单-集团用户"},value = "添加集团用户申请")
+ @ApiOperation(tags = {"小程序-集团用户"},value = "添加集团用户申请")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@Validated @RequestBody TEnterpriseUserApplication dto) {
// 用户id
@@ -53,31 +55,40 @@
return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
}
+ @Log(title = "添加集团用户申请", businessType = BusinessType.INSERT)
+ @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "后台添加集团用户申请")
+ @PostMapping(value = "/back/add")
+ public AjaxResult<Boolean> backAdd(@Validated @RequestBody TEnterpriseUserApplication dto) {
+ // 用户id
+ return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
+ }
+
@ApiOperation(tags = {"后台-申请表单-集团用户"},value = "集团用户列表")
@PostMapping(value = "/page")
- public AjaxResult<Page<TEnterpriseUserApplication>> page(EnterpriseQuery enterpriseQuery) {
+ public R<Page<TEnterpriseUserApplication>> page(EnterpriseQuery enterpriseQuery) {
// 用户id
if (enterpriseQuery.getPhone()!=null) {
List<Long> userIds = appUserClient.getUserIdsByPhone(enterpriseQuery.getPhone()).getData();
if (userIds.isEmpty()){
- return AjaxResult.warn("未查询到用户");
+ return R.ok();
}
Page<TEnterpriseUserApplication> page = enterpriseUserApplicationService.lambdaQuery().in(TEnterpriseUserApplication::getAppUserId, userIds).page(Page.of(enterpriseQuery.getPageCurr(), enterpriseQuery.getPageSize()));
- return AjaxResult.ok(page);
+ return R.ok(page);
}else {
Page<TEnterpriseUserApplication> page = enterpriseUserApplicationService.lambdaQuery().page(Page.of(enterpriseQuery.getPageCurr(), enterpriseQuery.getPageSize()));
- return AjaxResult.ok(page);
+ return R.ok(page);
}
}
@ApiOperation(tags = {"后台-申请表单-集团用户"},value = "备注")
- @GetMapping(value = "/remark")
- public AjaxResult pass(Integer id,String remark) {
+ @PostMapping(value = "/remark")
+ public AjaxResult pass(@RequestBody PassDto passDto) {
// 用户id
- TEnterpriseUserApplication byId = enterpriseUserApplicationService.getById(id);
- byId.setRemark(remark);
+ TEnterpriseUserApplication byId = enterpriseUserApplicationService.getById(passDto.getId());
+ byId.setRemark(passDto.getRemark());
+
enterpriseUserApplicationService.updateById(byId);
return AjaxResult.success();
}
--
Gitblit v1.7.1