楚江erp：反馈单增加搜索条件

@@ -114,7 +114,7 @@ public class SampleResultFeedbackController extends DefaultBaseController {
      * @param id            主键ID
      * @param id            主键ID
      * @param response      响应体
      * @param response      响应体
      */
      */
-    @ApiOperation("规格变更打印")
+    @ApiOperation("导出反馈单数据")
     @GetMapping("/export")
     @GetMapping("/export")
     public void export(@NotBlank(message = "id不能为空") String id, String exportType
     public void export(@NotBlank(message = "id不能为空") String id, String exportType
             , HttpServletResponse response) {
             , HttpServletResponse response) {

@@ -47,4 +47,11 @@ public class QuerySampleResultFeedbackVo extends PageVo implements BaseVo, Seria
     @ApiModelProperty("订单编号")
     @ApiModelProperty("订单编号")
     private String orderNo;
     private String orderNo;
 
 
+
+    /**
+     * 搜索关键字
+     * 客户名称或订单编号
+     */
+    @ApiModelProperty("搜索关键字")
+    private String searchKey;
 }
 }

@@ -56,6 +56,12 @@
             <if test="vo.orderNo != null and vo.orderNo != ''">
             <if test="vo.orderNo != null and vo.orderNo != ''">
                 AND o.order_no LIKE CONCAT('%', #{vo.orderNo}, '%')
                 AND o.order_no LIKE CONCAT('%', #{vo.orderNo}, '%')
             </if>
             </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (
+                    o.order_no LIKE CONCAT('%', #{vo.searchKey}, '%')
+                    OR c.name LIKE CONCAT('%', #{vo.searchKey}, '%')
+                )
+            </if>
         </where>
         </where>
     </select>
     </select>
 </mapper>
 </mapper>