From b7cd70a1dc48f2cd2f5ed36d09f92c8ebcc62c8b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 03 十一月 2023 15:20:45 +0800
Subject: [PATCH] 修改审批流程
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceOrganallocationController.java | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 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 0e55cfc..bac82e9 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
@@ -21,15 +21,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;
@@ -39,8 +38,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);
@@ -54,8 +52,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, "鍣ㄥ畼鍒嗛厤鏁版嵁");
@@ -67,8 +64,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));
}
@@ -80,9 +76,20 @@
@Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceOrganallocation serviceOrganallocation)
- {
+ 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));
+
}
/**
@@ -92,10 +99,21 @@
//@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
@Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceOrganallocation serviceOrganallocation)
- {
+ @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));
}
/**
@@ -105,8 +123,7 @@
//@PreAuthorize("@ss.hasPermi('project:organallocation:remove')")
@Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceOrganallocationService.removeByIds(Arrays.asList(ids)));
}
}
--
Gitblit v1.9.3