From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseRequestMapper.java | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 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 d44d171..d68ef85 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
@@ -2,45 +2,76 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
+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.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
/**
* ERP 閲囪喘鐢宠 Mapper
- *
- * @author 鑺嬮亾婧愮爜
*/
@Mapper
public interface ErpPurchaseRequestMapper extends BaseMapperX<ErpPurchaseRequestDO> {
-
- default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO reqVO) {
- MPJLambdaWrapperX<ErpPurchaseRequestDO> query = new MPJLambdaWrapperX<ErpPurchaseRequestDO>()
- .likeIfPresent(ErpPurchaseRequestDO::getNo, reqVO.getNo())
- .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, reqVO.getRequestUserId())
- .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, reqVO.getRequestDeptId())
- .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, reqVO.getRequestTime())
- .eqIfPresent(ErpPurchaseRequestDO::getStatus, reqVO.getStatus())
- .likeIfPresent(ErpPurchaseRequestDO::getRequestReason, reqVO.getRequestReason())
- .orderByDesc(ErpPurchaseRequestDO::getId);
- if (reqVO.getProductId() != null) {
- query.leftJoin(ErpPurchaseRequestItemDO.class, ErpPurchaseRequestItemDO::getRequestId, ErpPurchaseRequestDO::getId)
- .eq(ErpPurchaseRequestItemDO::getProductId, reqVO.getProductId())
- .groupBy(ErpPurchaseRequestDO::getId);
- }
- return selectJoinPage(reqVO, ErpPurchaseRequestDO.class, query);
- }
-
- default int updateByIdAndStatus(Long id, Integer status, ErpPurchaseRequestDO updateObj) {
- return update(updateObj, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
- .eq(ErpPurchaseRequestDO::getId, id).eq(ErpPurchaseRequestDO::getStatus, status));
- }
default ErpPurchaseRequestDO selectByNo(String no) {
return selectOne(ErpPurchaseRequestDO::getNo, no);
}
-}
+ default List<ErpPurchaseRequestDO> selectRequestListByIds(Collection<Long> ids) {
+ return selectList(ErpPurchaseRequestDO::getId, ids);
+ }
+
+ default List<ErpPurchaseRequestDO> selectList(Long supplierId, Integer status) {
+ return selectList(new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+ .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, supplierId)
+ .eqIfPresent(ErpPurchaseRequestDO::getStatus, status));
+ }
+
+ default PageResult<ErpPurchaseRequestDO> selectPage(ErpPurchaseRequestPageReqVO pageReqVO) {
+ return selectPage(pageReqVO, new LambdaQueryWrapperX<ErpPurchaseRequestDO>()
+ .likeIfPresent(ErpPurchaseRequestDO::getNo, pageReqVO.getNo())
+ .eqIfPresent(ErpPurchaseRequestDO::getRequestUserId, pageReqVO.getRequestUserId())
+ .eqIfPresent(ErpPurchaseRequestDO::getRequestDeptId, pageReqVO.getRequestDeptId())
+ .eqIfPresent(ErpPurchaseRequestDO::getSupplierId, pageReqVO.getSupplierId())
+ .eqIfPresent(ErpPurchaseRequestDO::getStatus, pageReqVO.getStatus())
+ .eqIfPresent(ErpPurchaseRequestDO::getInStatus, pageReqVO.getInStatus())
+ .betweenIfPresent(ErpPurchaseRequestDO::getRequestTime, pageReqVO.getRequestTime())
+ .orderByDesc(ErpPurchaseRequestDO::getId));
+ }
+
+ /**
+ * 鎻愪氦瀹℃壒锛氱疆涓哄鎵逛腑锛屽苟娓呯┖涓婁竴杞鏍哥粨鏋�
+ *
+ * 鐢� UpdateWrapper 鑰岄潪 updateById锛歁yBatis-Plus 榛樿鏇存柊绛栫暐蹇界暐 null锛�
+ * 鐩存帴 updateById 鏃犳硶鎶婂鏍镐笉閫氳繃鍚庢畫鐣欑殑瀹℃牳浜�/瀹℃牳鏃堕棿/瀹℃牳鎰忚娓呯┖銆�
+ */
+ default int submitAndResetAuditInfo(Long id, Integer status) {
+ return update(null, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
+ .eq(ErpPurchaseRequestDO::getId, id)
+ .set(ErpPurchaseRequestDO::getStatus, status)
+ .set(ErpPurchaseRequestDO::getReviewerId, null)
+ .set(ErpPurchaseRequestDO::getReviewerName, null)
+ .set(ErpPurchaseRequestDO::getReviewTime, null)
+ .set(ErpPurchaseRequestDO::getReviewRemark, null));
+ }
+
+ /**
+ * 瀹℃牳锛堥�氳繃 / 涓嶉�氳繃锛夛細鍐欏叆瀹℃牳缁撴灉銆佸鏍镐汉涓庡鏍告剰瑙�
+ */
+ default int auditPurchaseRequest(Long id, Integer status, Long reviewerId,
+ String reviewerName, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<ErpPurchaseRequestDO>()
+ .eq(ErpPurchaseRequestDO::getId, id)
+ .set(ErpPurchaseRequestDO::getStatus, status)
+ .set(ErpPurchaseRequestDO::getReviewerId, reviewerId)
+ .set(ErpPurchaseRequestDO::getReviewerName, reviewerName)
+ .set(ErpPurchaseRequestDO::getReviewTime, LocalDateTime.now())
+ .set(ErpPurchaseRequestDO::getReviewRemark, reviewRemark));
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.9.3