From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index f707b5b..95ab518 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
+import com.ruoyi.approve.mapper.ApprovalTemplateMapper;
+import com.ruoyi.approve.service.ApprovalInstanceService;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -26,6 +29,7 @@
import java.io.IOException;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -38,6 +42,8 @@
@AllArgsConstructor
public class ShippingInfoController extends BaseController {
+ private final ApprovalTemplateMapper approvalTemplateMapper;
+ private final ApprovalInstanceService approvalInstanceService;
private ShippingInfoService shippingInfoService;
private ApproveProcessServiceImpl approveProcessService;
private ShippingInfoMapper shippingInfoMapper;
@@ -66,6 +72,19 @@
approveProcessVO.setApproveUser(loginUser.getUserId());
approveProcessVO.setApproveTime(LocalDate.now().toString());
approveProcessService.addApprove(approveProcessVO);
+
+ ApprovalInstanceDto approvalInstanceDto = new ApprovalInstanceDto();
+ approvalInstanceDto.setTemplateId(req.getTemplateId());
+ approvalInstanceDto.setBusinessId(req.getId());
+ approvalInstanceDto.setBusinessType(7L);
+ approvalInstanceDto.setTitle("鍙戣揣缂栧彿锛�" + sh);
+ approvalInstanceDto.setApplicantId(SecurityUtils.getUserId());
+ approvalInstanceDto.setTemplateId(req.getTemplateId());
+ approvalInstanceDto.setTemplateName(approvalTemplateMapper.selectById(req.getTemplateId()).getTemplateName());
+ approvalInstanceDto.setApplicantName(SecurityUtils.getLoginUser().getNickName());
+ approvalInstanceDto.setApplyTime(LocalDateTime.now());
+ approvalInstanceService.add(approvalInstanceDto);
+
// 娣诲姞鍙戣揣娑堟伅
req.setShippingNo(sh);
req.setStatus("寰呭鏍�");
--
Gitblit v1.9.3