From f350465db70d6f9db9494483ee0cec7793a9007b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 19 八月 2026 17:47:57 +0800
Subject: [PATCH] feat(approve): 实现审批流程或签会签功能并优化数据库配置
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 96 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 80 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index 66a2d83..aa1104a 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -1,22 +1,30 @@
package com.ruoyi.collaborativeApproval.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.approve.pojo.KnowledgeBase;
+import com.ruoyi.approve.bean.vo.ApproveProcessVO;
+import com.ruoyi.approve.service.IApproveProcessService;
+import com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementService;
+import com.ruoyi.common.enums.FileNameType;
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 com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.pojo.CommonFile;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
@AllArgsConstructor
@@ -28,25 +36,66 @@
private SealApplicationManagementService sealApplicationManagementService;
@Autowired
- private ISysNoticeService sysNoticeService;
+ private IApproveProcessService approveProcessService;
+
+ @Autowired
+ private CommonFileMapper commonFileMapper;
@GetMapping("/getList")
@ApiOperation("鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
- return AjaxResult.success(sealApplicationManagementService.listPage(page,sealApplicationManagement));
+ IPage<SealApplicationManagementDTO> result = sealApplicationManagementService.listPage(page,sealApplicationManagement);
+ for (SealApplicationManagementDTO record : result.getRecords()) {
+ if (record.getApproveProcessId() != null) {
+ record.setCommonFileList(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, record.getApproveProcessId())
+ .eq(CommonFile::getType, FileNameType.ApproveProcess.getValue())));
+ }
+ }
+ return AjaxResult.success(result);
}
@PostMapping("/add")
- @ApiOperation("鏂板")
- public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
- //娑堟伅閫氱煡
- sysNoticeService.simpleNoticeByUser("鐢ㄥ嵃瀹℃壒",
- "鐢宠缂栧彿锛�"+sealApplicationManagement.getApplicationNum()+"\n"
- +"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
- Arrays.asList(sealApplicationManagement.getApproveUserId()),
- sealApplicationManagement.getTenantId(),
- "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
- return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement));
+ @ApiOperation("鏂板/閲嶆柊鐢宠鐢ㄥ嵃")
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement) throws Exception {
+ sealApplicationManagement.setStatus("pending");
+ if (sealApplicationManagement.getId() == null) {
+ sealApplicationManagementService.save(sealApplicationManagement);
+ } else {
+ // 閲嶆柊鐢宠锛氭竻鐞嗘棫瀹℃壒娴佺▼鍏宠仈鐨勯檮浠讹紝閬垮厤閬楃暀
+ SealApplicationManagement old = sealApplicationManagementService.getById(sealApplicationManagement.getId());
+ if (old != null && old.getApproveProcessId() != null) {
+ commonFileMapper.delete(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, old.getApproveProcessId())
+ .eq(CommonFile::getType, FileNameType.ApproveProcess.getValue()));
+ }
+ sealApplicationManagementService.updateById(sealApplicationManagement);
+ }
+ // 鍙戣捣鍗忓悓缁熶竴瀹℃牳娴佺▼锛堢敤鍗板鎵癸級
+ ApproveProcessVO vo = new ApproveProcessVO();
+ vo.setApproveType(9);
+ vo.setApproveReason(sealApplicationManagement.getApplicationNum() + "锛�" + sealApplicationManagement.getTitle());
+ vo.setApproveDeptId(sealApplicationManagement.getDeptId());
+ vo.setApproveTime(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ Long approveProcessId = approveProcessService.addApprove(vo);
+ // 鍥炲～瀹℃壒娴佺▼id锛屼緵瀹℃壒鍥炶皟鏇存柊鐘舵�併�佽鎯呮煡璇㈤檮浠�
+ sealApplicationManagement.setApproveProcessId(approveProcessId);
+ sealApplicationManagementService.updateById(sealApplicationManagement);
+ // 淇濆瓨鐢ㄥ嵃鐢宠闄勪欢锛屽叧鑱斿埌瀹℃壒娴佺▼
+ if (!CollectionUtils.isEmpty(sealApplicationManagement.getAttachmentList())) {
+ for (CommonFile cf : sealApplicationManagement.getAttachmentList()) {
+ CommonFile record = new CommonFile();
+ record.setCommonId(approveProcessId);
+ record.setName(cf.getName());
+ record.setUrl(cf.getUrl());
+ record.setType(FileNameType.ApproveProcess.getValue());
+ record.setCreateTime(LocalDateTime.now());
+ record.setUpdateTime(LocalDateTime.now());
+ commonFileMapper.insert(record);
+ }
+ }
+ return AjaxResult.success();
}
@PostMapping("/update")
@@ -64,6 +113,21 @@
return AjaxResult.success(sealApplicationManagementService.removeBatchByIds(ids));
}
+ @GetMapping("/detail")
+ @ApiOperation("鐢ㄥ嵃鐢宠璇︽儏锛堟寜瀹℃壒娴佺▼id锛�")
+ public AjaxResult detail(Long approveProcessId){
+ SealApplicationManagement seal = sealApplicationManagementService.getOne(new LambdaQueryWrapper<SealApplicationManagement>()
+ .eq(SealApplicationManagement::getApproveProcessId, approveProcessId)
+ .last("limit 1"));
+ if (seal == null) {
+ throw new RuntimeException("鐢ㄥ嵃鐢宠涓嶅瓨鍦�");
+ }
+ seal.setCommonFileList(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
+ .eq(CommonFile::getCommonId, approveProcessId)
+ .eq(CommonFile::getType, FileNameType.ApproveProcess.getValue())));
+ return AjaxResult.success(seal);
+ }
+
@ApiOperation(value = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
@PostMapping("/export")
public void export(HttpServletResponse response) {
--
Gitblit v1.9.3