From c9d4ba37c1f681b12e24014013fa9a28734bad42 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 20 八月 2026 17:00:02 +0800
Subject: [PATCH] feat 功能修正
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
index 21b9f44..21ca9d4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -7,16 +7,20 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.task.vo.MesProTaskPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.task.MesProTaskDO;
+import cn.iocoder.yudao.module.mes.enums.pro.MesProTaskStatusEnum;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
/**
* MES 鐢熶骇浠诲姟 Mapper
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Mapper
public interface MesProTaskMapper extends BaseMapperX<MesProTaskDO> {
@@ -44,6 +48,23 @@
return selectPage(reqVO, query);
}
+ default PageResult<MesProTaskDO> selectPendingFeedbackPage(MesProTaskPageReqVO reqVO) {
+ MPJLambdaWrapperX<MesProTaskDO> query = new MPJLambdaWrapperX<>();
+ query.selectAll(MesProTaskDO.class);
+ // 寰呮姤宸ュ彴璐︼細杩涜涓殑浠诲姟锛堟帓闄ゅ凡瀹屾垚/宸插彇娑堬級锛屼笖浠嶆湁寰呮姤宸ラ噺
+ query.in(MesProTaskDO::getStatus, MesProTaskStatusEnum.PREPARE.getStatus(),MesProTaskStatusEnum.PAUSED.getStatus());
+ query.apply("(quantity - IFNULL(produced_quantity, 0)) > 0");
+ query.likeIfPresent(MesProTaskDO::getCode, reqVO.getCode())
+ .likeIfPresent(MesProTaskDO::getName, reqVO.getName())
+ .eqIfPresent(MesProTaskDO::getWorkOrderId, reqVO.getWorkOrderId())
+ .eqIfPresent(MesProTaskDO::getRouteId, reqVO.getRouteId())
+ .eqIfPresent(MesProTaskDO::getProcessId, reqVO.getProcessId())
+ .eqIfPresent(MesProTaskDO::getWorkstationId, reqVO.getWorkstationId())
+ .betweenIfPresent(MesProTaskDO::getCreateTime, reqVO.getCreateTime())
+ .orderByDesc(MesProTaskDO::getId);
+ return selectPage(reqVO, query);
+ }
+
default List<MesProTaskDO> selectListByWorkOrderId(Long workOrderId) {
return selectList(new LambdaQueryWrapperX<MesProTaskDO>()
.eqIfPresent(MesProTaskDO::getWorkOrderId, workOrderId)
@@ -56,6 +77,24 @@
.orderByDesc(MesProTaskDO::getId));
}
+ /**
+ * 鐝粍鎶ュ伐宸ユ椂缁熻锛氭寜鐝粍鑱氬悎浠诲姟鏁颁笌鐢熶骇鏃堕暱锛坉uration 浜烘棩锛�
+ *
+ * @param startTime 鐢熶骇寮�濮嬫椂闂翠笅闄�
+ * @param endTime 鐢熶骇寮�濮嬫椂闂翠笂闄�
+ */
+ default List<Map<String, Object>> selectWorkHourSummary(LocalDateTime startTime, LocalDateTime endTime) {
+ return selectMaps(new QueryWrapper<MesProTaskDO>()
+ .select("team_id", "team_name",
+ "COUNT(*) AS task_count",
+ "SUM(IFNULL(duration, 0)) AS total_duration")
+ // 鎶ュ伐鍙ｅ緞锛氭帓闄よ崏绋�/宸插彇娑堬紝浠呯粺璁″疄闄呰繘鍏ョ敓浜х殑浠诲姟
+ .notIn("status", MesProTaskStatusEnum.PREPARE.getStatus(), MesProTaskStatusEnum.CANCELED.getStatus())
+ .ge(startTime != null, "start_time", startTime)
+ .le(endTime != null, "start_time", endTime)
+ .groupBy("team_id", "team_name"));
+ }
+
default void updateProducedQuantity(Long id,
BigDecimal incrProducedQuantity,
BigDecimal incrQualifyQuantity,
--
Gitblit v1.9.3