原始数据导入

songhua-system/src/main/java/com/songhua/system/domain/PzRawData.java

@@ -26,6 +26,7 @@ public class PzRawData extends BaseEntity {
      */
     @Excel(name = "票种名")
     private Long ticketId;
+    private String ticketName;
 
     /**
      * 支付类型

songhua-system/src/main/resources/mapper/system/PzRawDataMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN pz_ticket_type_management b ON a.ticket_id = b.id
         <where>
             <if test="number != null ">and number = #{number}</if>
+            <if test="ticketName != null  and ticketName != ''"> and b.ticket_name like concat('%', #{ticketName}, '%')</if>
             <if test="money != null  and money != ''">and money = #{money}</if>
             <if test="payType != null  and payType != ''">and pay_type = #{payType}</if>
         </where>

songhua-ui/src/views/system/data/index.vue

@@ -1,22 +1,22 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="张数" prop="number">
+      <el-form-item label="票种名" prop="ticketName">
         <el-input
-          v-model="queryParams.number"
-          placeholder="请输入张数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="金额" prop="money">
-        <el-input
-          v-model="queryParams.money"
-          placeholder="请输入金额"
+          v-model="queryParams.ticketName"
+          placeholder="请输入票种名"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+<!--      <el-form-item label="金额" prop="money">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.money"-->
+<!--          placeholder="请输入金额"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -69,20 +69,22 @@
       <el-col :span="1.5">
         <el-button
           v-hasPermi="['system:data:import']"
-          icon="el-icon-upload2"
+          icon=""
+          icon="el-icon-download"
+
           plain
           size="mini"
-          type="info"
+          type="warning"
           @click="handleImport"
         >导入
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          icon="el-icon-download"
+          icon="el-icon-upload2"
           plain
           size="mini"
-          type="info"
+          type="primary"
           @click="handleExport"
         >导出
         </el-button>
@@ -374,7 +376,7 @@ export default {
       // 关闭请稍候提示
       this.upload.showProgressMessage = false;
       this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", {dangerouslyUseHTMLString: true});
+      this.$modal.msgSuccess("导入成功");
       this.getList();
     },
     // 提交上传文件