From 41ab7abd0b0ec0fefb03b60bbaf42c02fbda666b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 15:53:16 +0800
Subject: [PATCH] feat(production): 添加生产订单与销售台账关联功能
---
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index dc4284a..8adcf8d 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -5,11 +5,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
import com.ruoyi.projectManagement.service.RolesService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,36 +18,43 @@
@RestController
@AllArgsConstructor
-@RequestMapping("/roles")
-@Api(value = "Roles", tags = "")
+@RequestMapping("/projectManagement/roles")
+@Tag(name = "")
public class RolesController {
private RolesService rolesservice;
private RolesMapper rolesMapper;
@GetMapping("/listPage")
- @ApiOperation("鍒嗛〉鏌ヨ鎵�鏈�")
+ @Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈�")
public AjaxResult listPage(Page<Roles> page, Roles roles) {
return AjaxResult.success(rolesservice.listPage(page, roles));
}
@PostMapping("/add")
- @ApiOperation("鏂板")
- public AjaxResult add(@RequestBody Roles role) {
- role.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS"));
- return AjaxResult.success(rolesservice.save(role));
+ @Operation(summary = "鏂板")
+ public AjaxResult add(@RequestBody RoleDto roleDto) {
+ if (roleDto.getIsDefaultNo()) {
+ roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no"));
+ }
+ return AjaxResult.success(rolesservice.save(roleDto));
}
@PostMapping("/update")
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody Roles roles) {
return AjaxResult.success(rolesservice.updateById(roles));
}
@DeleteMapping("/delete")
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
return AjaxResult.success(rolesservice.removeBatchByIds(ids));
}
+
+ @PostMapping("/listSimpleRole")
+ public AjaxResult listSimpleRole() {
+ return AjaxResult.success(rolesservice.listSimpleRole());
+ }
}
--
Gitblit v1.9.3