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/ErpPurchaseOrderMapper.java | 64 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
index 76f979c..322e2b5 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
@@ -8,16 +8,18 @@
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
/**
* ERP 閲囪喘璁㈠崟 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface ErpPurchaseOrderMapper extends BaseMapperX<ErpPurchaseOrderDO> {
@@ -70,6 +72,57 @@
.eq(ErpPurchaseOrderDO::getId, id).eq(ErpPurchaseOrderDO::getStatus, status));
}
+ /**
+ * 鎻愪氦瀹℃壒锛氭洿鏂扮姸鎬佸苟娓呯┖涓婁竴杞殑瀹℃牳淇℃伅
+ *
+ * 璇存槑锛氬繀椤讳娇鐢� LambdaUpdateWrapper 鏄惧紡 set null锛�
+ * 鍚﹀垯 MyBatis-Plus 鐨� updateById 浼氬拷鐣� null 瀛楁锛屽鑷撮┏鍥炲師鍥犳畫鐣欍��
+ */
+ default int submitAndResetAuditInfo(Long id, Integer status) {
+ return update(null, new LambdaUpdateWrapper<ErpPurchaseOrderDO>()
+ .eq(ErpPurchaseOrderDO::getId, id)
+ .in(ErpPurchaseOrderDO::getStatus,
+ ErpPurchaseOrderStatusEnum.DRAFT.getStatus(), ErpPurchaseOrderStatusEnum.REJECT.getStatus())
+ .set(ErpPurchaseOrderDO::getStatus, status)
+ .set(ErpPurchaseOrderDO::getReviewerId, null)
+ .set(ErpPurchaseOrderDO::getReviewerName, null)
+ .set(ErpPurchaseOrderDO::getReviewTime, null)
+ .set(ErpPurchaseOrderDO::getReviewRemark, null));
+ }
+
+ /**
+ * 瀹℃牳锛堥�氳繃 / 涓嶉�氳繃锛夛細鍐欏叆瀹℃牳浜轰笌瀹℃牳鎰忚
+ */
+ default int auditPurchaseOrder(Long id, Integer status, Long reviewerId, String reviewerName, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<ErpPurchaseOrderDO>()
+ .eq(ErpPurchaseOrderDO::getId, id)
+ .eq(ErpPurchaseOrderDO::getStatus, ErpPurchaseOrderStatusEnum.PROCESS.getStatus())
+ .set(ErpPurchaseOrderDO::getStatus, status)
+ .set(ErpPurchaseOrderDO::getReviewerId, reviewerId)
+ .set(ErpPurchaseOrderDO::getReviewerName, reviewerName)
+ .set(ErpPurchaseOrderDO::getReviewTime, LocalDateTime.now())
+ .set(ErpPurchaseOrderDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
+ * BPM 瀹℃壒缁撴潫鍚庡洖鍐欓噰璐鍗曠姸鎬�
+ *
+ * 浠呭綋閲囪喘璁㈠崟浠嶅浜庛�屽鎵逛腑銆嶆椂鏇存柊锛岄伩鍏嶄笌鏃у鎵硅矾寰勯噸澶嶈鐩栥��
+ *
+ * @param id 缂栧彿
+ * @param status 鐩爣鐘舵�侊紙瀹℃牳閫氳繃 / 瀹℃牳涓嶉�氳繃 / 宸插彇娑堬級
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<ErpPurchaseOrderDO>()
+ .eq(ErpPurchaseOrderDO::getId, id)
+ .eq(ErpPurchaseOrderDO::getStatus, ErpPurchaseOrderStatusEnum.PROCESS.getStatus())
+ .set(ErpPurchaseOrderDO::getStatus, status)
+ .set(ErpPurchaseOrderDO::getReviewTime, LocalDateTime.now())
+ .set(ErpPurchaseOrderDO::getReviewRemark, reviewRemark));
+ }
+
default ErpPurchaseOrderDO selectByNo(String no) {
return selectOne(ErpPurchaseOrderDO::getNo, no);
}
@@ -81,4 +134,13 @@
.orderByDesc(ErpPurchaseOrderDO::getId));
}
+ /**
+ * 鎸夋潵婧愭煡璇㈤噰璐鍗曪紙鐢ㄤ簬杩芥函鏉ユ簮宸ュ崟瀵瑰簲鐨勯噰璐鍗曪級
+ */
+ default List<ErpPurchaseOrderDO> selectListBySource(Integer sourceType, Long sourceId) {
+ return selectList(new LambdaQueryWrapperX<ErpPurchaseOrderDO>()
+ .eq(ErpPurchaseOrderDO::getSourceType, sourceType)
+ .eq(ErpPurchaseOrderDO::getSourceId, sourceId));
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3