fix(bag+invoice): 赛包+发票后台管理页面用新UI重构

src/main/java/com/dlbridge/jadp/plugins/partner/bean/InvoiceParam.java

@@ -21,6 +21,9 @@ public class InvoiceParam {
     @ApiModelProperty(value = "参赛号", notes = "参赛号")
     private String markNo;
 
+    @ApiModelProperty(value = "关键字", notes = "关键字")
+    private String keyword;
+
     @ApiModelProperty(value = "开票方式（0：电子发票，1：纸质发票）", notes = "开票方式（0：电子发票，1：纸质发票）")
     private String paperInvoice;
 

src/main/java/com/dlbridge/jadp/plugins/partner/mapper/InvoiceMapper.xml

@@ -103,7 +103,7 @@
             status
         from invoice_record
         where del_flag = 0
-        <include refid="bag-where-sql"/>
+        <include refid="invoice-where-sql"/>
         order by create_date
         limit #{page.offset},#{page.size}
     </select>
@@ -112,10 +112,10 @@
         select count(1)
         from invoice_record
         where del_flag=0
-        <include refid="bag-where-sql"/>
+        <include refid="invoice-where-sql"/>
     </select>
 
-    <sql id="bag-where-sql">
+    <sql id="invoice-where-sql">
         and cmpt_id = #{param.cmptId}
         <if test="param.status != null">
             and status=#{param.status}
@@ -129,6 +129,9 @@
         <if test="param.markNo != null and param.markNo != '' ">
             and mark_no=#{param.markNo}
         </if>
+        <if test="param.keyword != null and param.keyword != '' ">
+            and (mark_no like '%${param.keyword}%' or receiver_name like '%${param.keyword}%' or receiver_phone like '%${param.keyword}%')
+        </if>
         <if test="param.isCompany != null and param.isCompany != '' ">
             and is_company=#{param.isCompany}
         </if>

src/main/webapp/WEB-INF/views/cmpt/feedback.jsp

@@ -756,7 +756,7 @@
                                                 loading.value = false
                                                 if (data.code === 200) {
                                                     feedbacks.value = data.content.content
-                                                    pagination.itemCount = res.data.total
+                                                    pagination.itemCount = data.content.total
                                                 } else {
                                                     message.error(data.msg)
                                                 }