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-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/stocktaking/task/MesWmStockTakingTaskMapper.java | 122 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 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 67c0918..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,7 +5,11 @@
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;
+
+import java.time.LocalDateTime;
/**
* MES 鐩樼偣浠诲姟 Mapper
@@ -19,6 +23,124 @@
return selectOne(MesWmStockTakingTaskDO::getCode, code);
}
+ /**
+ * 寮�濮嬬洏鐐癸細缃负鐩樼偣涓紝骞舵竻绌轰笂涓�杞鏍哥粨鏋�
+ *
+ * 鐢� UpdateWrapper 鑰岄潪 updateById锛歁yBatis-Plus 榛樿鏇存柊绛栫暐蹇界暐 null锛�
+ * 鐩存帴 updateById 鏃犳硶鎶婂鏍镐汉 / 瀹℃牳鏃堕棿 / 瀹℃牳鎰忚鐪熸娓呯┖銆�
+ *
+ * @param id 鐩樼偣浠诲姟缂栧彿
+ * @param status 鐩爣鐘舵�侊紙鐩樼偣涓級
+ * @return 褰卞搷琛屾暟
+ */
+ default int submitAndResetAuditInfo(Long id, Integer status) {
+ return update(null, new LambdaUpdateWrapper<MesWmStockTakingTaskDO>()
+ .eq(MesWmStockTakingTaskDO::getId, id)
+ .set(MesWmStockTakingTaskDO::getStatus, status)
+ .set(MesWmStockTakingTaskDO::getReviewerId, null)
+ .set(MesWmStockTakingTaskDO::getReviewerName, null)
+ .set(MesWmStockTakingTaskDO::getReviewTime, null)
+ .set(MesWmStockTakingTaskDO::getReviewRemark, null));
+ }
+
+ /**
+ * 鎻愪氦缁撴灉瀹℃壒锛氬啓鍏ユ彁浜ゆ椂闂村苟娓呯┖涓婁竴杞殑瀹℃牳浜轰笌瀹℃牳鎰忚
+ *
+ * 浠诲姟鐘舵�佷繚鎸併�岀洏鐐逛腑銆嶄笉鍙橈紙璇ョ姸鎬佸悓鏃舵壙杞界洏鐐逛腑涓庣粨鏋滃鎵逛腑涓や釜闃舵锛夛紝
+ * 浠� reviewTime 闈炵┖涓� reviewerId 涓虹┖琛ㄧず銆岀粨鏋滃鎵瑰凡鎻愪氦銆佺瓑寰呭鏍搞�嶃��
+ * 涓嶄慨鏀� status 瀛楁锛屾晠鐢� UpdateWrapper 绮剧‘鍐欏叆銆�
+ *
+ * @param id 鐩樼偣浠诲姟缂栧彿
+ * @return 褰卞搷琛屾暟
+ */
+ default int markResultApprovalSubmitted(Long id) {
+ return update(null, new LambdaUpdateWrapper<MesWmStockTakingTaskDO>()
+ .eq(MesWmStockTakingTaskDO::getId, id)
+ .set(MesWmStockTakingTaskDO::getReviewTime, LocalDateTime.now())
+ .set(MesWmStockTakingTaskDO::getReviewerId, null)
+ .set(MesWmStockTakingTaskDO::getReviewerName, null)
+ .set(MesWmStockTakingTaskDO::getReviewRemark, null));
+ }
+
+ /**
+ * 瀹℃牳缁撴灉锛氬啓鍏ュ鏍哥粨鏋溿�佸鏍镐汉涓庡鏍告剰瑙�
+ *
+ * @param id 鐩樼偣浠诲姟缂栧彿
+ * @param status 鐩爣鐘舵�侊紙宸插畬鎴� / 鐩樼偣涓級
+ * @param reviewerId 瀹℃牳浜虹紪鍙�
+ * @param reviewerName 瀹℃牳浜哄鍚�
+ * @param reviewRemark 瀹℃牳鎰忚
+ * @return 褰卞搷琛屾暟
+ */
+ default int auditStockTakingTask(Long id, Integer status, Long reviewerId,
+ String reviewerName, String reviewRemark) {
+ return update(null, new LambdaUpdateWrapper<MesWmStockTakingTaskDO>()
+ .eq(MesWmStockTakingTaskDO::getId, id)
+ .set(MesWmStockTakingTaskDO::getStatus, status)
+ .set(MesWmStockTakingTaskDO::getReviewerId, reviewerId)
+ .set(MesWmStockTakingTaskDO::getReviewerName, reviewerName)
+ .set(MesWmStockTakingTaskDO::getReviewTime, LocalDateTime.now())
+ .set(MesWmStockTakingTaskDO::getReviewRemark, reviewRemark));
+ }
+
+ /**
+ * 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));
+ }
+
+ /**
+ * 娓呯┖瀹℃牳鏍囪
+ *
+ * 鐢ㄤ簬浠诲姟鍙栨秷鍚庢竻闄ょ粨鏋滃鎵圭棔杩�
+ *
+ * @param id 鐩樼偣浠诲姟缂栧彿
+ */
+ default void clearAuditInfo(Long id) {
+ update(null, new LambdaUpdateWrapper<MesWmStockTakingTaskDO>()
+ .eq(MesWmStockTakingTaskDO::getId, id)
+ .set(MesWmStockTakingTaskDO::getReviewerId, null)
+ .set(MesWmStockTakingTaskDO::getReviewerName, null)
+ .set(MesWmStockTakingTaskDO::getReviewTime, null)
+ .set(MesWmStockTakingTaskDO::getReviewRemark, null));
+ }
+
default PageResult<MesWmStockTakingTaskDO> selectPage(MesWmStockTakingTaskPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<MesWmStockTakingTaskDO>()
.likeIfPresent(MesWmStockTakingTaskDO::getCode, reqVO.getCode())
--
Gitblit v1.9.3