feat(order): 添加项目编号筛选功能并优化订单列表展示

- 在订单管理页面添加项目编号筛选条件
- 在订单列表中增加项目编号展示列
- 更新订单查询 SQL，支持项目编号模糊搜索- 优化项目信息查询 SQL，提高查询效率

ruoyi-admin/src/main/resources/templates/manage/order/order.html

@@ -29,6 +29,10 @@
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
+                            <li>
+                                <label>项目编号：</label>
+                                <input type="text" name="projectCode"/>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -91,6 +95,10 @@
                 {
                     field: 'orderName',
                     title: '合同名称'
+                },
+                    {
+                        field: 'projectCode',
+                        title: '项目编号'
                 },
                 {
                     field: 'customerName',

ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml

@@ -129,6 +129,7 @@
             and t1.status=0
             <if test="orderCode != null  and orderCode != ''">and t1.order_code like concat('%', #{orderCode}, '%')</if>
             <if test="orderName != null  and orderName != ''">and t1.order_name like concat('%', #{orderName}, '%')</if>
+            <if test="projectCode != null  and projectCode != ''">and t1.project_code like concat('%', #{projectCode}, '%')</if>
             <if test="customerName != null  and customerName != ''">and t1.customer_name like concat('%', #{customerName},
                 '%')
             </if>
@@ -150,6 +151,7 @@
                 select delivery_id from delivery_list where serial_number=#{serialNumber}))
             </if>
         </where>
+        order by t1.created_at desc
     </select>
 
     <select id="selectOrderInfoById" parameterType="Long" resultMap="OrderInfoOrderListResult">

ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectProjectInfoList" parameterType="ProjectInfo" resultMap="ProjectInfoResult">
-        <include refid="selectProjectInfoVo"/>
+        <include refid="selectRelationProjectInfoVo"/>
         <where>  
             <if test="projectCode != null  and projectCode != ''"> and t1.project_code = #{projectCode}</if>
             <if test="projectName != null  and projectName != ''"> and t1.project_name like concat('%', #{projectName}, '%')</if>