From e827178c2b6b9f4883a5bcecc90a8be2c4f525df Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 18 六月 2024 14:08:01 +0800
Subject: [PATCH] 打印界面以及添加审核人信息
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 1d9b3ff..b386c6b 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -15,7 +15,6 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.SysErrorService;
-import com.sun.org.apache.regexp.internal.RE;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -236,12 +235,12 @@
return map;
}
//璁㈠崟瀹℃牳
- public boolean reviewOrderById(String id,Integer status) {
+ public boolean reviewOrderById(String id, Integer status, String userId, String userName) {
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
if(order.getProcessReview()!=2){
throw new ServiceException(Constants.Code_600,"璇ヨ鍗曡繕鏈鏍�");
}
- return orderMapper.reviewOrderById(id,status);
+ return orderMapper.reviewOrderById(id,status,userId,userName);
}
//宸ヨ壓瀹℃牳鐣岄潰瀹℃牳鏇存柊鏁版嵁
public boolean reviewProcessById(String id, Integer status,List<OrderGlassDetail> orderGlassDetails) {
--
Gitblit v1.8.0