From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
index d68ef85..8e8522f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchaseRequestStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -53,6 +54,8 @@
default int submitAndResetAuditInfo(Long id, Integer status) {
return update(null, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
.eq(ErpPurchaseRequestDO::getId, id)
+ .in(ErpPurchaseRequestDO::getStatus,
+ ErpPurchaseRequestStatusEnum.DRAFT.getStatus(), ErpPurchaseRequestStatusEnum.REJECT.getStatus())
.set(ErpPurchaseRequestDO::getStatus, status)
.set(ErpPurchaseRequestDO::getReviewerId, null)
.set(ErpPurchaseRequestDO::getReviewerName, null)
@@ -67,6 +70,7 @@
String reviewerName, String reviewRemark) {
return update(null, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
.eq(ErpPurchaseRequestDO::getId, id)
+ .eq(ErpPurchaseRequestDO::getStatus, ErpPurchaseRequestStatusEnum.PROCESS.getStatus())
.set(ErpPurchaseRequestDO::getStatus, status)
.set(ErpPurchaseRequestDO::getReviewerId, reviewerId)
.set(ErpPurchaseRequestDO::getReviewerName, reviewerName)
@@ -74,4 +78,23 @@
.set(ErpPurchaseRequestDO::getReviewRemark, reviewRemark));
}
+ /**
+ * BPM 瀹℃壒缁撴潫鍚庡洖鍐欓噰璐敵璇风姸鎬�
+ *
+ * 浠呭綋閲囪喘鐢宠浠嶅浜庛�屽鎵逛腑銆嶆椂鏇存柊锛岄伩鍏嶄笌鏃у鎵硅矾寰勯噸澶嶈鐩栥��
+ *
+ * @param id 缂栧彿
+ * @param status 鐩爣鐘舵�侊紙瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃 / 宸插彇娑堬級
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
+ .eq(ErpPurchaseRequestDO::getId, id)
+ .eq(ErpPurchaseRequestDO::getStatus, ErpPurchaseRequestStatusEnum.PROCESS.getStatus())
+ .set(ErpPurchaseRequestDO::getStatus, status)
+ .set(ErpPurchaseRequestDO::getReviewTime, LocalDateTime.now())
+ .set(ErpPurchaseRequestDO::getReviewRemark, reviewRemark));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3