From 5421b8af862890dcf187c2ad5ece55423959ba85 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 19:27:14 +0800
Subject: [PATCH] feat(bpm): 全部业务审批流改回 BPM，审批统一进入协同办公
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java
index 5103c32..86e1a51 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.MesWmStockTakingTaskPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskDO;
+import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockTakingTaskStatusEnum;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
@@ -83,6 +84,48 @@
}
/**
+ * BPM 瀹℃壒閫氳繃鍥炲啓锛氫粎褰撲换鍔″浜庛�岀洏鐐逛腑 + 缁撴灉瀹℃壒寰呭鏍搞�嶆椂鏇存柊涓哄凡瀹屾垚
+ *
+ * 寰呭鏍哥殑鍒ゆ柇鏉′欢涓庢湇鍔″眰 isResultApprovalPending 涓�鑷达細reviewTime 闈炵┖涓� reviewerId 涓虹┖锛�
+ * 閬垮厤閲嶅 / 杩囨湡浜嬩欢瑕嗙洊浜哄伐瀹℃牳缁撴灉銆�
+ *
+ * @param id 鐩樼偣浠诲姟缂栧彿
+ * @param status 鐩爣鐘舵�侊紙宸插畬鎴愶級
+ * @param reviewRemark 瀹℃壒鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int updateAuditStatusByBpm(Long id, Integer status, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<MesWmStockTakingTaskDO>()
+ .eq(MesWmStockTakingTaskDO::getId, id)
+ .eq(MesWmStockTakingTaskDO::getStatus, MesWmStockTakingTaskStatusEnum.APPROVING.getStatus())
+ .isNotNull(MesWmStockTakingTaskDO::getReviewTime)
+ .isNull(MesWmStockTakingTaskDO::getReviewerId)
+ .set(MesWmStockTakingTaskDO::getStatus, status)
+ .set(MesWmStockTakingTaskDO::getReviewTime, LocalDateTime.now())
+ .set(MesWmStockTakingTaskDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
+ * BPM 瀹℃壒涓嶉�氳繃 / 鎾ら攢鍥炲啓锛氫换鍔′繚鎸佺洏鐐逛腑锛屾竻绌烘彁浜ゆ爣璁颁互渚块噸鏂版彁浜ょ粨鏋滃鎵�
+ *
+ * 娓呯┖ reviewTime锛堟彁浜ゆ爣璁帮級鍚� isResultApprovalPending 杩斿洖 false锛�
+ * 鍏佽鐢ㄦ埛淇敼瀹炵洏鍚庨噸鏂版彁浜わ紱淇濈暀 reviewRemark 渚涚敤鎴锋煡鐪嬩笉閫氳繃鍘熷洜銆�
+ *
+ * @param id 鐩樼偣浠诲姟缂栧彿
+ * @param reviewRemark 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
+ * @return 褰卞搷琛屾暟
+ */
+ default int resetResultApprovalByBpm(Long id, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<MesWmStockTakingTaskDO>()
+ .eq(MesWmStockTakingTaskDO::getId, id)
+ .eq(MesWmStockTakingTaskDO::getStatus, MesWmStockTakingTaskStatusEnum.APPROVING.getStatus())
+ .isNotNull(MesWmStockTakingTaskDO::getReviewTime)
+ .isNull(MesWmStockTakingTaskDO::getReviewerId)
+ .set(MesWmStockTakingTaskDO::getReviewTime, null)
+ .set(MesWmStockTakingTaskDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
* 娓呯┖瀹℃牳鏍囪
*
* 鐢ㄤ簬浠诲姟鍙栨秷鍚庢竻闄ょ粨鏋滃鎵圭棔杩�
--
Gitblit v1.9.3