From 227eff61120aaca63e068035d745d86452e6499a Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:12 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessMapper.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessMapper.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessMapper.java
index 894ab32..6d1814d 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessMapper.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/business/CrmBusinessMapper.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.crm.dal.mysql.business;
+import cn.hutool.core.date.LocalDateTimeUtil;
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.LambdaQueryWrapperX;
@@ -7,11 +8,14 @@
import cn.iocoder.yudao.module.crm.controller.admin.business.vo.business.CrmBusinessPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.statistics.vo.funnel.CrmStatisticsFunnelReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.business.CrmBusinessDO;
+import cn.iocoder.yudao.module.crm.enums.business.CrmBusinessEndStatusEnum;
import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
import cn.iocoder.yudao.module.crm.util.CrmPermissionUtils;
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.Collection;
import java.util.List;
@@ -65,10 +69,80 @@
.eq(CrmBusinessDO::getOwnerUserId, ownerUserId));
}
+ default List<CrmBusinessDO> selectListByCustomerId(Long customerId) {
+ return selectList(CrmBusinessDO::getCustomerId, customerId);
+ }
+
default PageResult<CrmBusinessDO> selectPage(CrmStatisticsFunnelReqVO pageVO) {
return selectPage(pageVO, new LambdaQueryWrapperX<CrmBusinessDO>()
.in(CrmBusinessDO::getOwnerUserId, pageVO.getUserIds())
.betweenIfPresent(CrmBusinessDO::getCreateTime, pageVO.getTimes()));
}
+ // ========== 缁熻鏂规硶 ==========
+
+ default Long selectTodayCount() {
+ LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
+ LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(LocalDateTime.now());
+ return selectCount(new LambdaQueryWrapperX<CrmBusinessDO>()
+ .between(CrmBusinessDO::getCreateTime, beginOfToday, endOfToday));
+ }
+
+ default BigDecimal selectTotalPriceSum() {
+ LambdaQueryWrapperX<CrmBusinessDO> query = new LambdaQueryWrapperX<>();
+ query.select(CrmBusinessDO::getTotalPrice);
+ List<CrmBusinessDO> list = selectList(query);
+ return list.stream()
+ .map(CrmBusinessDO::getTotalPrice)
+ .filter(p -> p != null)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
+ default Long selectSuccessCount() {
+ return selectCount(new LambdaQueryWrapperX<CrmBusinessDO>()
+ .eq(CrmBusinessDO::getEndStatus, CrmBusinessEndStatusEnum.WIN.getStatus()));
+ }
+
+ default BigDecimal selectSuccessPriceSum() {
+ LambdaQueryWrapperX<CrmBusinessDO> query = new LambdaQueryWrapperX<>();
+ query.eq(CrmBusinessDO::getEndStatus, CrmBusinessEndStatusEnum.WIN.getStatus())
+ .select(CrmBusinessDO::getTotalPrice);
+ List<CrmBusinessDO> list = selectList(query);
+ return list.stream()
+ .map(CrmBusinessDO::getTotalPrice)
+ .filter(p -> p != null)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
+ default Long selectProcessingCount() {
+ return selectCount(new LambdaQueryWrapperX<CrmBusinessDO>()
+ .isNull(CrmBusinessDO::getEndStatus));
+ }
+
+ default Long selectFailCount() {
+ return selectCount(new LambdaQueryWrapperX<CrmBusinessDO>()
+ .eq(CrmBusinessDO::getEndStatus, CrmBusinessEndStatusEnum.LOSE.getStatus()));
+ }
+
+ default List<Long> selectOwnerUserIds() {
+ LambdaQueryWrapperX<CrmBusinessDO> query = new LambdaQueryWrapperX<>();
+ query.select(CrmBusinessDO::getOwnerUserId).isNotNull(CrmBusinessDO::getOwnerUserId);
+ List<CrmBusinessDO> list = selectList(query);
+ return list.stream().map(CrmBusinessDO::getOwnerUserId).distinct().toList();
+ }
+
+ default Long selectCountByOwnerUserId(Long ownerUserId) {
+ return selectCount(CrmBusinessDO::getOwnerUserId, ownerUserId);
+ }
+
+ default BigDecimal selectPriceSumByOwnerUserId(Long ownerUserId) {
+ LambdaQueryWrapperX<CrmBusinessDO> query = new LambdaQueryWrapperX<>();
+ query.eq(CrmBusinessDO::getOwnerUserId, ownerUserId).select(CrmBusinessDO::getTotalPrice);
+ List<CrmBusinessDO> list = selectList(query);
+ return list.stream()
+ .map(CrmBusinessDO::getTotalPrice)
+ .filter(p -> p != null)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ }
+
}
--
Gitblit v1.9.3