From 7343ddac08f35472e08525334f1d583269b89bef Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Fri, 6 Jun 2025 11:32:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BC=96=E5=8F=B7=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在订单管理页面添加项目编号筛选条件 - 在订单列表中增加项目编号展示列 - 更新订单查询 SQL,支持项目编号模糊搜索- 优化项目信息查询 SQL,提高查询效率 --- .../src/main/resources/templates/manage/order/order.html | 8 ++++++++ .../src/main/resources/mapper/manage/OrderInfoMapper.xml | 2 ++ .../src/main/resources/mapper/sip/ProjectInfoMapper.xml | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/order.html b/ruoyi-admin/src/main/resources/templates/manage/order/order.html index ecc75f1e..cfa1dd3b 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/order.html @@ -29,6 +29,10 @@ +
  • + + +
  •  搜索  重置 @@ -91,6 +95,10 @@ { field: 'orderName', title: '合同名称' + }, + { + field: 'projectCode', + title: '项目编号' }, { field: 'customerName', diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 88848db3..c1a61260 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -129,6 +129,7 @@ and t1.status=0 and t1.order_code like concat('%', #{orderCode}, '%') and t1.order_name like concat('%', #{orderName}, '%') + and t1.project_code like concat('%', #{projectCode}, '%') and t1.customer_name like concat('%', #{customerName}, '%') @@ -150,6 +151,7 @@ select delivery_id from delivery_list where serial_number=#{serialNumber})) + order by t1.created_at desc - + and t1.project_code = #{projectCode} and t1.project_name like concat('%', #{projectName}, '%')