From 63328dd80adc6331db581dda6418308e6fd4da12 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 16:50:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index ef1e7a4..0f7094d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -1,24 +1,34 @@
package com.ruoyi.collaborativeApproval.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
import java.util.List;
@AllArgsConstructor
@RestController
@RequestMapping("/sealApplicationManagement")
+@Api(tags = "鐢ㄥ嵃鐢宠绠＄悊")
public class SealApplicationManagementController {
@Autowired
private SealApplicationManagementService sealApplicationManagementService;
+
+ @Autowired
+ private ISysNoticeService sysNoticeService;
@GetMapping("/getList")
@ApiOperation("鍒嗛〉鏌ヨ")
@@ -29,7 +39,15 @@
@PostMapping("/add")
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
- return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement));
+ sealApplicationManagementService.save(sealApplicationManagement);
+ //娑堟伅閫氱煡
+ sysNoticeService.simpleNoticeByUser("鐢ㄥ嵃瀹℃壒",
+ "鐢宠缂栧彿锛�"+sealApplicationManagement.getApplicationNum()+"\n"
+ +"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
+ Arrays.asList(sealApplicationManagement.getApproveUserId()),
+ sealApplicationManagement.getTenantId(),
+ "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
+ return AjaxResult.success();
}
@PostMapping("/update")
@@ -47,4 +65,12 @@
return AjaxResult.success(sealApplicationManagementService.removeBatchByIds(ids));
}
+ @ApiOperation(value = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response) {
+ List<SealApplicationManagement> accountExpenses = sealApplicationManagementService.list();
+ ExcelUtil<SealApplicationManagement> util = new ExcelUtil<SealApplicationManagement>(SealApplicationManagement.class);
+ util.exportExcel(response, accountExpenses, "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭");
+ }
+
}
--
Gitblit v1.9.3