From 0989ec1e6b465141f99ed67e40fa2a0b928dce94 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 29 四月 2026 16:54:51 +0800
Subject: [PATCH] feat(production): 新增生产核算和生产工单功能模块 - 添加生产核算控制器、服务接口及实现类 - 实现生产核算分页查询和工人生产工资信息查询功能 - 添加生产工单控制器、服务接口及实现类 - 实现生产工单的增删改查和状态统计功能 - 集成工单流转卡下载和二维码生成功能 - 添加工单相关的数据传输对象和值对象 - 实现工单与用户关联的分配功能 - 完善工单附件图片处理和展示功能

---
 src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml b/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
index 08e16e4..c7f33c8 100644
--- a/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
@@ -36,11 +36,15 @@
         <where>
             cpp.delete_flag = 0
             <if test="c.customerName != null and c.customerName != ''">
-                and c.customer_name like concat('%', #{c.customerName}, '%')
+                and (c.customer_name like concat('%', #{c.customerName}, '%') or cp.customer_name like concat('%', #{c.customerName}, '%'))
+            </if>
+            <if test="c.customerType != null">
+                and c.customer_type = #{c.customerType}
             </if>
             <if test="c.boundId != null">
                 and cpp.bound_id = #{c.boundId}
             </if>
+
         </where>
         order by cpp.id desc
     </select>

--
Gitblit v1.9.3