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}, '%')