From ed0d872dddf37672ceb9bc499099f65d63ed1ce3 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 21 五月 2026 09:28:36 +0800
Subject: [PATCH] feat(approve): 添加企业新闻审批功能并完善审批实例管理
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 0257f2a..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("寰呭鏍�");
@@ -116,7 +135,7 @@
@GetMapping("/getByCustomerName")
- @Operation(summary = "閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
+ @Operation(summary = "閫氳繃瀹㈡埛鍚嶇О鏌ヨ鍏宠仈鐨勫彂璐у崟鍙�")
public AjaxResult getByCustomerName(String customerName) {
return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
}
--
Gitblit v1.9.3