From 5bbf6b97525dd92c81fe91447953e7819f8a4e18 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 17 八月 2026 16:49:46 +0800
Subject: [PATCH] 上级账户可以将下属账户添加的团队成员退出团队
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java
index 722c63d..1892e1c 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/itemconsume/MesWmItemConsumeLineMapper.java
@@ -4,24 +4,34 @@
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* MES 鐗╂枡娑堣�楄褰曡 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesWmItemConsumeLineMapper extends BaseMapperX<MesWmItemConsumeLineDO> {
- default PageResult<MesWmItemConsumeLineDO> selectPage(MesWmItemConsumeLinePageReqVO reqVO,
- Long consumeId) {
- return selectPage(reqVO, new LambdaQueryWrapperX<MesWmItemConsumeLineDO>()
- .eq(MesWmItemConsumeLineDO::getConsumeId, consumeId)
- .orderByDesc(MesWmItemConsumeLineDO::getId));
+ /**
+ * 鍒嗛〉鏌ヨ娑堣�楄锛堝叧鑱� mdm_item + mdm_unit_measure锛岄�氳繃 feedbackId锛�
+ */
+ IPage<MesWmItemConsumeLineRespVO> selectPageByFeedbackId(
+ Page<MesWmItemConsumeLineRespVO> page, @Param("feedbackId") Long feedbackId);
+
+ default PageResult<MesWmItemConsumeLineRespVO> selectPageByFeedbackId(
+ MesWmItemConsumeLinePageReqVO reqVO) {
+ Page<MesWmItemConsumeLineRespVO> mpPage = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+ IPage<MesWmItemConsumeLineRespVO> result = selectPageByFeedbackId(mpPage, reqVO.getFeedbackId());
+ return new PageResult<>(result.getRecords(), result.getTotal());
}
default List<MesWmItemConsumeLineDO> selectListByConsumeId(Long consumeId) {
--
Gitblit v1.9.3