From 57a6735173d59feb6cfd95c9a8ec76d6f87bc578 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 四月 2024 12:46:28 +0800
Subject: [PATCH] PDF合并，BUG修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
index 02d1df8..24d25be 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java
@@ -1,11 +1,13 @@
package com.ruoyi.web.controller.project;
import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceOrganallocation;
import com.ruoyi.project.service.IServiceOrganallocationService;
@@ -20,15 +22,14 @@
/**
* 鍣ㄥ畼鍒嗛厤Controller
- *
+ *
* @author ruoyi
* @date 2021-11-10
*/
@Api("鍣ㄥ畼鍒嗛厤绠＄悊")
@RestController
@RequestMapping("/project/organallocation")
-public class ServiceOrganallocationController extends BaseController
-{
+public class ServiceOrganallocationController extends BaseController {
@Autowired
private IServiceOrganallocationService serviceOrganallocationService;
@@ -38,8 +39,7 @@
@ApiOperation("鍣ㄥ畼鍒嗛厤淇℃伅鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:organallocation:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceOrganallocation serviceOrganallocation)
- {
+ public TableDataInfo list(ServiceOrganallocation serviceOrganallocation) {
startPage();
//List<ServiceOrganallocation> list = serviceOrganallocationService.queryList(serviceOrganallocation);
List<ServiceOrganallocation> list = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
@@ -53,8 +53,7 @@
//@PreAuthorize("@ss.hasPermi('project:organallocation:export')")
@Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceOrganallocation serviceOrganallocation)
- {
+ public AjaxResult export(ServiceOrganallocation serviceOrganallocation) {
List<ServiceOrganallocation> list = serviceOrganallocationService.queryList(serviceOrganallocation);
ExcelUtil<ServiceOrganallocation> util = new ExcelUtil<ServiceOrganallocation>(ServiceOrganallocation.class);
return util.exportExcel(list, "鍣ㄥ畼鍒嗛厤鏁版嵁");
@@ -66,8 +65,7 @@
@ApiOperation("閫氳繃id鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organallocation:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceOrganallocationService.getById(id));
}
@@ -78,10 +76,21 @@
//@PreAuthorize("@ss.hasPermi('project:organallocation:add')")
@Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.INSERT)
@PostMapping
- @RepeatSubmit
- public AjaxResult add(@RequestBody ServiceOrganallocation serviceOrganallocation)
- {
+ @NotRepeatCommit(key = "param:arg[1]", value = 30000)
+ public AjaxResult add(@RequestBody ServiceOrganallocation serviceOrganallocation) {
return toAjax(serviceOrganallocationService.save(serviceOrganallocation));
+ }
+
+ /**
+ * 鏂板鍣ㄥ畼鍒嗛厤
+ */
+ @ApiOperation("鏂板鍣ㄥ畼鍒嗛厤闆嗗悎淇℃伅")
+ @Log(title = "鍣ㄥ畼鍒嗛厤闆嗗悎", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @RepeatSubmit
+ public AjaxResult addArrayData(@RequestBody List<ServiceOrganallocation> serviceOrganallocations) {
+ return AjaxResult.success(serviceOrganallocationService.saveDate(serviceOrganallocations));
+
}
/**
@@ -90,11 +99,22 @@
@ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
@Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
- @PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation)
- {
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation) {
return toAjax(serviceOrganallocationService.updateById(serviceOrganallocation));
+ }
+
+ /**
+ * 淇敼鍣ㄥ畼鍒嗛厤
+ */
+ @ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅")
+ //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
+ @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
+ @PostMapping("/editarraydata")
+ @RepeatSubmit
+ public AjaxResult editArrayData(@RequestBody List<ServiceOrganallocation> serviceOrganallocations) {
+ return AjaxResult.success(serviceOrganallocationService.editArrayData(serviceOrganallocations));
}
/**
@@ -103,9 +123,8 @@
@ApiOperation("鍒犻櫎鍣ㄥ畼鍒嗛厤淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organallocation:remove')")
@Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceOrganallocationService.removeByIds(Arrays.asList(ids)));
}
}
--
Gitblit v1.9.3