修改卡状态

back-ui/src/views/dz/cards/index.vue

@@ -1,216 +1,216 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="账号" prop="cardNo">
+      <el-form-item label="卡号" prop="cardNo">
         <el-input
-          v-model="queryParams.cardNo"
-          placeholder="请输入账号"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.cardNo"
+                placeholder="请输入卡号"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="初始密码" prop="password">
-        <el-input
-          v-model="queryParams.password"
-          placeholder="请输入初始密码"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="0电子卡" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择0电子卡" clearable style="width: 170px">
+<!--      <el-form-item label="初始密码" prop="password">-->
+<!--        <el-input-->
+<!--                v-model="queryParams.password"-->
+<!--                placeholder="请输入初始密码"-->
+<!--                clearable-->
+<!--                @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="卡类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择卡类型" clearable style="width: 170px;">
           <el-option
-            v-for="dict in card_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+                  v-for="dict in card_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="0未开卡,1已开卡,2已激活," prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择0未开卡,1已开卡,2已激活," clearable style="width: 170px">
+      <el-form-item label="卡状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择卡状态" clearable style="width: 170px;">
           <el-option
-            v-for="dict in card_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+                  v-for="dict in card_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="0未分配,1已分配" prop="distributeStatus">
-        <el-select v-model="queryParams.distributeStatus" placeholder="请选择0未分配,1已分配" clearable style="width: 170px">
+      <el-form-item label="分配状态" prop="distributeStatus">
+        <el-select v-model="queryParams.distributeStatus" placeholder="请选择分配状态" clearable style="width: 170px;">
           <el-option
-            v-for="dict in card_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+                  v-for="dict in card_distribute_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="9已过期,10已关卡,11已失效" prop="timeStatus">
-        <el-select v-model="queryParams.timeStatus" placeholder="请选择9已过期,10已关卡,11已失效" clearable style="width: 170px">
+      <el-form-item label="过期状态" prop="timeStatus">
+        <el-select v-model="queryParams.timeStatus" placeholder="请选择过期状态" clearable style="width: 170px;">
           <el-option
-            v-for="dict in card_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+                  v-for="dict in card_time_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="0=未缴费,1=已缴费,2=已退费" prop="payStatus">
-        <el-select v-model="queryParams.payStatus" placeholder="请选择0=未缴费,1=已缴费,2=已退费" clearable style="width: 170px">
+      <el-form-item label="缴费状态" prop="payStatus">
+        <el-select v-model="queryParams.payStatus" placeholder="请选择缴费状态" clearable style="width: 170px;">
           <el-option
-            v-for="dict in card_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+                  v-for="dict in card_action"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="是否结算(0:否,1:是)" prop="isSettlement">
-        <el-select v-model="queryParams.isSettlement" placeholder="请选择是否结算(0:否,1:是)" clearable style="width: 170px">
+      <el-form-item label="是否结算" prop="isSettlement">
+        <el-select v-model="queryParams.isSettlement" placeholder="请选择是否结算" clearable style="width: 170px;">
           <el-option
-            v-for="dict in sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+                  v-for="dict in bool_values"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <el-form-item label="一级代理商ID" prop="agentId">
         <el-input
-          v-model="queryParams.agentId"
-          placeholder="请输入一级代理商ID"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.agentId"
+                placeholder="请输入一级代理商ID"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="末级代理商ID" prop="leftAgentId">
         <el-input
-          v-model="queryParams.leftAgentId"
-          placeholder="请输入末级代理商ID"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.leftAgentId"
+                placeholder="请输入末级代理商ID"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="安排校区" prop="campusId">
         <el-input
-          v-model="queryParams.campusId"
-          placeholder="请输入安排校区"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.campusId"
+                placeholder="请输入安排校区"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="分配学校" prop="assignSchoolId">
         <el-input
-          v-model="queryParams.assignSchoolId"
-          placeholder="请输入分配学校"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.assignSchoolId"
+                placeholder="请输入分配学校"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="校区id" prop="schoolId">
         <el-input
-          v-model="queryParams.schoolId"
-          placeholder="请输入校区id"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.schoolId"
+                placeholder="请输入校区id"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="校区班级ID" prop="classesId">
         <el-input
-          v-model="queryParams.classesId"
-          placeholder="请输入校区班级ID"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.classesId"
+                placeholder="请输入校区班级ID"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="班级/入学年份" prop="year">
         <el-input
-          v-model="queryParams.year"
-          placeholder="请输入班级/入学年份"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.year"
+                placeholder="请输入班级/入学年份"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="高考年份" prop="endYear">
         <el-input
-          v-model="queryParams.endYear"
-          placeholder="请输入高考年份"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.endYear"
+                placeholder="请输入高考年份"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="开卡ID" prop="openId">
         <el-input
-          v-model="queryParams.openId"
-          placeholder="请输入开卡ID"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.openId"
+                placeholder="请输入开卡ID"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="分配时间" prop="distributeTime">
         <el-date-picker clearable
-          v-model="queryParams.distributeTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择分配时间">
+                        v-model="queryParams.distributeTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择分配时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="过期时间" prop="outDate">
         <el-date-picker clearable
-          v-model="queryParams.outDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择过期时间">
+                        v-model="queryParams.outDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择过期时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="开卡时间" prop="openTime">
         <el-date-picker clearable
-          v-model="queryParams.openTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择开卡时间">
+                        v-model="queryParams.openTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择开卡时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="缴费时间" prop="payTime">
         <el-date-picker clearable
-          v-model="queryParams.payTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择缴费时间">
+                        v-model="queryParams.payTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择缴费时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="激活时间" prop="activeTime">
         <el-date-picker clearable
-          v-model="queryParams.activeTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择激活时间">
+                        v-model="queryParams.activeTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择激活时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="结算时间" prop="settlementTime">
         <el-date-picker clearable
-          v-model="queryParams.settlementTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择结算时间">
+                        v-model="queryParams.settlementTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择结算时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="退费时间" prop="refundTime">
         <el-date-picker clearable
-          v-model="queryParams.refundTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择退费时间">
+                        v-model="queryParams.refundTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择退费时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="关卡时间" prop="closeTime">
         <el-date-picker clearable
-          v-model="queryParams.closeTime"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择关卡时间">
+                        v-model="queryParams.closeTime"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择关卡时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -222,40 +222,40 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['dz:cards:add']"
+                type="primary"
+                plain
+                icon="Plus"
+                @click="handleAdd"
+                v-hasPermi="['dz:cards:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['dz:cards:edit']"
+                type="success"
+                plain
+                icon="Edit"
+                :disabled="single"
+                @click="handleUpdate"
+                v-hasPermi="['dz:cards:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['dz:cards:remove']"
+                type="danger"
+                plain
+                icon="Delete"
+                :disabled="multiple"
+                @click="handleDelete"
+                v-hasPermi="['dz:cards:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['dz:cards:export']"
+                type="warning"
+                plain
+                icon="Download"
+                @click="handleExport"
+                v-hasPermi="['dz:cards:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -264,36 +264,36 @@
     <el-table v-loading="loading" :data="cardsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="cardId" />
-      <el-table-column label="账号" align="center" prop="cardNo" />
+      <el-table-column label="卡号" align="center" prop="cardNo" />
       <el-table-column label="初始密码" align="center" prop="password" />
-      <el-table-column label="0电子卡" align="center" prop="type">
+      <el-table-column label="卡类型" align="center" prop="type">
         <template #default="scope">
-          <dict-tag :options="card_status" :value="scope.row.type"/>
+          <dict-tag :options="card_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
-      <el-table-column label="0未开卡,1已开卡,2已激活," align="center" prop="status">
+      <el-table-column label="卡状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :options="card_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="0未分配,1已分配" align="center" prop="distributeStatus">
+      <el-table-column label="分配状态" align="center" prop="distributeStatus">
         <template #default="scope">
-          <dict-tag :options="card_status" :value="scope.row.distributeStatus"/>
+          <dict-tag :options="card_distribute_status" :value="scope.row.distributeStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="9已过期,10已关卡,11已失效" align="center" prop="timeStatus">
+      <el-table-column label="过期状态" align="center" prop="timeStatus">
         <template #default="scope">
-          <dict-tag :options="card_status" :value="scope.row.timeStatus"/>
+          <dict-tag :options="card_time_status" :value="scope.row.timeStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="0=未缴费,1=已缴费,2=已退费" align="center" prop="payStatus">
+      <el-table-column label="缴费状态" align="center" prop="payStatus">
         <template #default="scope">
-          <dict-tag :options="card_status" :value="scope.row.payStatus"/>
+          <dict-tag :options="card_action" :value="scope.row.payStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否结算(0:否,1:是)" align="center" prop="isSettlement">
+      <el-table-column label="结算状态" align="center" prop="isSettlement">
         <template #default="scope">
-          <dict-tag :options="sys_yes_no" :value="scope.row.isSettlement"/>
+          <dict-tag :options="bool_values" :value="scope.row.isSettlement"/>
         </template>
       </el-table-column>
       <el-table-column label="机构ID" align="center" prop="deptId" />
@@ -356,78 +356,78 @@
     </el-table>
 
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+            v-show="total>0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
     />
 
     <!-- 添加或修改学习卡对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="cardsRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="账号" prop="cardNo">
-          <el-input v-model="form.cardNo" placeholder="请输入账号" />
+        <el-form-item label="卡号" prop="cardNo">
+          <el-input v-model="form.cardNo" placeholder="请输入卡号" />
         </el-form-item>
         <el-form-item label="初始密码" prop="password">
           <el-input v-model="form.password" placeholder="请输入初始密码" />
         </el-form-item>
-        <el-form-item label="0电子卡" prop="type">
-          <el-select v-model="form.type" placeholder="请选择0电子卡">
+        <el-form-item label="卡类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择卡类型">
             <el-option
-              v-for="dict in card_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
+                    v-for="dict in card_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="0未开卡,1已开卡,2已激活," prop="status">
-          <el-select v-model="form.status" placeholder="请选择0未开卡,1已开卡,2已激活,">
+        <el-form-item label="卡状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择卡状态">
             <el-option
-              v-for="dict in card_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
+                    v-for="dict in card_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="0未分配,1已分配" prop="distributeStatus">
-          <el-select v-model="form.distributeStatus" placeholder="请选择0未分配,1已分配">
+        <el-form-item label="分配状态" prop="distributeStatus">
+          <el-select v-model="form.distributeStatus" placeholder="请选择分配状态">
             <el-option
-              v-for="dict in card_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
+                    v-for="dict in card_distribute_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="9已过期,10已关卡,11已失效" prop="timeStatus">
-          <el-select v-model="form.timeStatus" placeholder="请选择9已过期,10已关卡,11已失效">
+        <el-form-item label="过期状态" prop="timeStatus">
+          <el-select v-model="form.timeStatus" placeholder="请选择过期状态">
             <el-option
-              v-for="dict in card_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
+                    v-for="dict in card_time_status"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="0=未缴费,1=已缴费,2=已退费" prop="payStatus">
-          <el-select v-model="form.payStatus" placeholder="请选择0=未缴费,1=已缴费,2=已退费">
+        <el-form-item label="缴费状态" prop="payStatus">
+          <el-select v-model="form.payStatus" placeholder="请选择缴费状态">
             <el-option
-              v-for="dict in card_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
+                    v-for="dict in card_action"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否结算(0:否,1:是)" prop="isSettlement">
+        <el-form-item label="结算状态" prop="isSettlement">
           <el-radio-group v-model="form.isSettlement">
             <el-radio
-              v-for="dict in sys_yes_no"
-              :key="dict.value"
-              :label="parseInt(dict.value)"
+                    v-for="dict in bool_values"
+                    :key="dict.value"
+                    :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -463,66 +463,66 @@
         </el-form-item>
         <el-form-item label="分配时间" prop="distributeTime">
           <el-date-picker clearable
-            v-model="form.distributeTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择分配时间">
+                          v-model="form.distributeTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择分配时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="过期时间" prop="outDate">
           <el-date-picker clearable
-            v-model="form.outDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择过期时间">
+                          v-model="form.outDate"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择过期时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="开卡时间" prop="openTime">
           <el-date-picker clearable
-            v-model="form.openTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择开卡时间">
+                          v-model="form.openTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择开卡时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="缴费时间" prop="payTime">
           <el-date-picker clearable
-            v-model="form.payTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择缴费时间">
+                          v-model="form.payTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择缴费时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="激活时间" prop="activeTime">
           <el-date-picker clearable
-            v-model="form.activeTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择激活时间">
+                          v-model="form.activeTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择激活时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结算时间" prop="settlementTime">
           <el-date-picker clearable
-            v-model="form.settlementTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择结算时间">
+                          v-model="form.settlementTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择结算时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="退费时间" prop="refundTime">
           <el-date-picker clearable
-            v-model="form.refundTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择退费时间">
+                          v-model="form.refundTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择退费时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="关卡时间" prop="closeTime">
           <el-date-picker clearable
-            v-model="form.closeTime"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择关卡时间">
+                          v-model="form.closeTime"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择关卡时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -537,211 +537,211 @@
 </template>
 
 <script setup name="Cards">
-import { listCards, getCards, delCards, addCards, updateCards } from "@/api/dz/cards"
+  import { listCards, getCards, delCards, addCards, updateCards } from "@/api/dz/cards"
 
-const { proxy } = getCurrentInstance()
-const { card_status, sys_yes_no } = proxy.useDict('card_status', 'sys_yes_no')
+  const { proxy } = getCurrentInstance()
+  const { card_status, card_distribute_status, card_time_status, bool_values, card_action, card_type } = proxy.useDict('card_status', 'card_distribute_status', 'card_time_status', 'bool_values', 'card_action', 'card_type')
 
-const cardsList = ref([])
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref([])
-const single = ref(true)
-const multiple = ref(true)
-const total = ref(0)
-const title = ref("")
+  const cardsList = ref([])
+  const open = ref(false)
+  const loading = ref(true)
+  const showSearch = ref(true)
+  const ids = ref([])
+  const single = ref(true)
+  const multiple = ref(true)
+  const total = ref(0)
+  const title = ref("")
 
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    cardNo: null,
-    password: null,
-    type: null,
-    status: null,
-    distributeStatus: null,
-    timeStatus: null,
-    payStatus: null,
-    isSettlement: null,
-    deptId: null,
-    agentId: null,
-    leftAgentId: null,
-    campusId: null,
-    assignSchoolId: null,
-    schoolId: null,
-    classesId: null,
-    year: null,
-    endYear: null,
-    openId: null,
-    distributeTime: null,
-    outDate: null,
-    openTime: null,
-    payTime: null,
-    activeTime: null,
-    settlementTime: null,
-    refundTime: null,
-    closeTime: null,
-  },
-  rules: {
-    type: [
-      { required: true, message: "0电子卡不能为空", trigger: "change" }
-    ],
-    status: [
-      { required: true, message: "0未开卡,1已开卡,2已激活,不能为空", trigger: "change" }
-    ],
-    distributeStatus: [
-      { required: true, message: "0未分配,1已分配不能为空", trigger: "change" }
-    ],
-    timeStatus: [
-      { required: true, message: "9已过期,10已关卡,11已失效不能为空", trigger: "change" }
-    ],
-    payStatus: [
-      { required: true, message: "0=未缴费,1=已缴费,2=已退费不能为空", trigger: "change" }
-    ],
-    isSettlement: [
-      { required: true, message: "是否结算(0:否,1:是)不能为空", trigger: "change" }
-    ],
-    createTime: [
-      { required: true, message: "生成时间不能为空", trigger: "blur" }
-    ],
-    updateTime: [
-      { required: true, message: "更新时间不能为空", trigger: "blur" }
-    ]
-  }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-/** 查询学习卡列表 */
-function getList() {
-  loading.value = true
-  listCards(queryParams.value).then(response => {
-    cardsList.value = response.rows
-    total.value = response.total
-    loading.value = false
+  const data = reactive({
+    form: {},
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      cardNo: null,
+      password: null,
+      type: null,
+      status: null,
+      distributeStatus: null,
+      timeStatus: null,
+      payStatus: null,
+      isSettlement: null,
+      deptId: null,
+      agentId: null,
+      leftAgentId: null,
+      campusId: null,
+      assignSchoolId: null,
+      schoolId: null,
+      classesId: null,
+      year: null,
+      endYear: null,
+      openId: null,
+      distributeTime: null,
+      outDate: null,
+      openTime: null,
+      payTime: null,
+      activeTime: null,
+      settlementTime: null,
+      refundTime: null,
+      closeTime: null,
+    },
+    rules: {
+      type: [
+        { required: true, message: "卡类型不能为空", trigger: "change" }
+      ],
+      status: [
+        { required: true, message: "卡状态不能为空", trigger: "change" }
+      ],
+      distributeStatus: [
+        { required: true, message: "分配状态不能为空", trigger: "change" }
+      ],
+      timeStatus: [
+        { required: true, message: "过期状态不能为空", trigger: "change" }
+      ],
+      payStatus: [
+        { required: true, message: "缴费状态不能为空", trigger: "change" }
+      ],
+      isSettlement: [
+        { required: true, message: "结算状态不能为空", trigger: "change" }
+      ],
+      createTime: [
+        { required: true, message: "生成时间不能为空", trigger: "blur" }
+      ],
+      updateTime: [
+        { required: true, message: "更新时间不能为空", trigger: "blur" }
+      ]
+    }
   })
-}
 
-// 取消按钮
-function cancel() {
-  open.value = false
-  reset()
-}
+  const { queryParams, form, rules } = toRefs(data)
 
-// 表单重置
-function reset() {
-  form.value = {
-    cardId: null,
-    cardNo: null,
-    password: null,
-    type: null,
-    status: null,
-    distributeStatus: null,
-    timeStatus: null,
-    payStatus: null,
-    isSettlement: null,
-    deptId: null,
-    agentId: null,
-    leftAgentId: null,
-    campusId: null,
-    assignSchoolId: null,
-    schoolId: null,
-    classesId: null,
-    year: null,
-    endYear: null,
-    openId: null,
-    remark: null,
-    distributeTime: null,
-    outDate: null,
-    openTime: null,
-    payTime: null,
-    activeTime: null,
-    settlementTime: null,
-    refundTime: null,
-    closeTime: null,
-    createTime: null,
-    updateTime: null
+  /** 查询学习卡列表 */
+  function getList() {
+    loading.value = true
+    listCards(queryParams.value).then(response => {
+      cardsList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
   }
-  proxy.resetForm("cardsRef")
-}
 
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
-}
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
 
-/** 重置按钮操作 */
-function resetQuery() {
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
+  // 表单重置
+  function reset() {
+    form.value = {
+      cardId: null,
+      cardNo: null,
+      password: null,
+      type: null,
+      status: null,
+      distributeStatus: null,
+      timeStatus: null,
+      payStatus: null,
+      isSettlement: null,
+      deptId: null,
+      agentId: null,
+      leftAgentId: null,
+      campusId: null,
+      assignSchoolId: null,
+      schoolId: null,
+      classesId: null,
+      year: null,
+      endYear: null,
+      openId: null,
+      remark: null,
+      distributeTime: null,
+      outDate: null,
+      openTime: null,
+      payTime: null,
+      activeTime: null,
+      settlementTime: null,
+      refundTime: null,
+      closeTime: null,
+      createTime: null,
+      updateTime: null
+    }
+    proxy.resetForm("cardsRef")
+  }
 
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.cardId)
-  single.value = selection.length != 1
-  multiple.value = !selection.length
-}
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    getList()
+  }
 
-/** 新增按钮操作 */
-function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加学习卡"
-}
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
 
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  reset()
-  const _cardId = row.cardId || ids.value
-  getCards(_cardId).then(response => {
-    form.value = response.data
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.cardId)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
+
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
     open.value = true
-    title.value = "修改学习卡"
-  })
-}
+    title.value = "添加学习卡"
+  }
 
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["cardsRef"].validate(valid => {
-    if (valid) {
-      if (form.value.cardId != null) {
-        updateCards(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addCards(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _cardId = row.cardId || ids.value
+    getCards(_cardId).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改学习卡"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["cardsRef"].validate(valid => {
+      if (valid) {
+        if (form.value.cardId != null) {
+          updateCards(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addCards(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
       }
-    }
-  })
-}
+    })
+  }
 
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const _cardIds = row.cardId || ids.value
-  proxy.$modal.confirm('是否确认删除学习卡编号为"' + _cardIds + '"的数据项？').then(function() {
-    return delCards(_cardIds)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _cardIds = row.cardId || ids.value
+    proxy.$modal.confirm('是否确认删除学习卡编号为"' + _cardIds + '"的数据项？').then(function() {
+      return delCards(_cardIds)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => {})
+  }
 
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('dz/cards/export', {
-    ...queryParams.value
-  }, `cards_${new Date().getTime()}.xlsx`)
-}
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('dz/cards/export', {
+      ...queryParams.value
+    }, `cards_${new Date().getTime()}.xlsx`)
+  }
 
-getList()
+  getList()
 </script>

back-ui/src/views/dz/subject/index.vue

@@ -3,43 +3,45 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="科目名称" prop="subjectName">
         <el-input
-          v-model="queryParams.subjectName"
-          placeholder="请输入科目名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="拼音" prop="pinyin">
-        <el-input
-          v-model="queryParams.pinyin"
-          placeholder="请输入拼音"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="排序" prop="sort">
-        <el-input
-          v-model="queryParams.sort"
-          placeholder="请输入排序"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.subjectName"
+                placeholder="请输入科目名称"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
+<!--      <el-form-item label="拼音" prop="pinyin">-->
+<!--        <el-input-->
+<!--                v-model="queryParams.pinyin"-->
+<!--                placeholder="请输入拼音"-->
+<!--                clearable-->
+<!--                @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="排序" prop="sort">-->
+<!--        <el-input-->
+<!--                v-model="queryParams.sort"-->
+<!--                placeholder="请输入排序"-->
+<!--                clearable-->
+<!--                @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="适合省份" prop="locations">
         <el-input
-          v-model="queryParams.locations"
-          placeholder="请输入适合省份"
-          clearable
-          @keyup.enter="handleQuery"
+                v-model="queryParams.locations"
+                placeholder="请输入适合省份"
+                clearable
+                @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="适合类别" prop="examTypes">
-        <el-input
-          v-model="queryParams.examTypes"
-          placeholder="请输入适合类别"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-select v-model="queryParams.examTypes" placeholder="请选择适合类别" clearable style="width: 170px;">
+          <el-option
+                  v-for="dict in exam_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -50,40 +52,40 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['dz:subject:add']"
+                type="primary"
+                plain
+                icon="Plus"
+                @click="handleAdd"
+                v-hasPermi="['dz:subject:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['dz:subject:edit']"
+                type="success"
+                plain
+                icon="Edit"
+                :disabled="single"
+                @click="handleUpdate"
+                v-hasPermi="['dz:subject:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['dz:subject:remove']"
+                type="danger"
+                plain
+                icon="Delete"
+                :disabled="multiple"
+                @click="handleDelete"
+                v-hasPermi="['dz:subject:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['dz:subject:export']"
+                type="warning"
+                plain
+                icon="Download"
+                @click="handleExport"
+                v-hasPermi="['dz:subject:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -96,7 +98,11 @@
       <el-table-column label="拼音" align="center" prop="pinyin" />
       <el-table-column label="排序" align="center" prop="sort" />
       <el-table-column label="适合省份" align="center" prop="locations" />
-      <el-table-column label="适合类别" align="center" prop="examTypes" />
+      <el-table-column label="适合类别" align="center" prop="examTypes">
+        <template #default="scope">
+          <dict-tag :options="exam_type" :value="scope.row.examTypes"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dz:subject:edit']">修改</el-button>
@@ -104,13 +110,13 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+            v-show="total>0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
     />
 
     <!-- 添加或修改科目对话框 -->
@@ -129,7 +135,14 @@
           <el-input v-model="form.locations" placeholder="请输入适合省份" />
         </el-form-item>
         <el-form-item label="适合类别" prop="examTypes">
-          <el-input v-model="form.examTypes" placeholder="请输入适合类别" />
+          <el-select v-model="form.examTypes" placeholder="请选择适合类别">
+            <el-option
+                    v-for="dict in exam_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+            ></el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -143,141 +156,142 @@
 </template>
 
 <script setup name="Subject">
-import { listSubject, getSubject, delSubject, addSubject, updateSubject } from "@/api/dz/subject"
+  import { listSubject, getSubject, delSubject, addSubject, updateSubject } from "@/api/dz/subject"
 
-const { proxy } = getCurrentInstance()
+  const { proxy } = getCurrentInstance()
+  const { exam_type } = proxy.useDict('exam_type')
 
-const subjectList = ref([])
-const open = ref(false)
-const loading = ref(true)
-const showSearch = ref(true)
-const ids = ref([])
-const single = ref(true)
-const multiple = ref(true)
-const total = ref(0)
-const title = ref("")
-
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    subjectName: null,
-    pinyin: null,
-    sort: null,
-    locations: null,
-    examTypes: null
-  },
-  rules: {
-  }
-})
+  const subjectList = ref([])
+  const open = ref(false)
+  const loading = ref(true)
+  const showSearch = ref(true)
+  const ids = ref([])
+  const single = ref(true)
+  const multiple = ref(true)
+  const total = ref(0)
+  const title = ref("")
 
-const { queryParams, form, rules } = toRefs(data)
-
-/** 查询科目列表 */
-function getList() {
-  loading.value = true
-  listSubject(queryParams.value).then(response => {
-    subjectList.value = response.rows
-    total.value = response.total
-    loading.value = false
+  const data = reactive({
+    form: {},
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      subjectName: null,
+      pinyin: null,
+      sort: null,
+      locations: null,
+      examTypes: null
+    },
+    rules: {
+    }
   })
-}
 
-// 取消按钮
-function cancel() {
-  open.value = false
-  reset()
-}
+  const { queryParams, form, rules } = toRefs(data)
 
-// 表单重置
-function reset() {
-  form.value = {
-    subjectId: null,
-    subjectName: null,
-    pinyin: null,
-    sort: null,
-    locations: null,
-    examTypes: null
+  /** 查询科目列表 */
+  function getList() {
+    loading.value = true
+    listSubject(queryParams.value).then(response => {
+      subjectList.value = response.rows
+      total.value = response.total
+      loading.value = false
+    })
   }
-  proxy.resetForm("subjectRef")
-}
 
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
-}
+  // 取消按钮
+  function cancel() {
+    open.value = false
+    reset()
+  }
 
-/** 重置按钮操作 */
-function resetQuery() {
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
+  // 表单重置
+  function reset() {
+    form.value = {
+      subjectId: null,
+      subjectName: null,
+      pinyin: null,
+      sort: null,
+      locations: null,
+      examTypes: null
+    }
+    proxy.resetForm("subjectRef")
+  }
 
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.subjectId)
-  single.value = selection.length != 1
-  multiple.value = !selection.length
-}
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1
+    getList()
+  }
 
-/** 新增按钮操作 */
-function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加科目"
-}
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef")
+    handleQuery()
+  }
 
-/** 修改按钮操作 */
-function handleUpdate(row) {
-  reset()
-  const _subjectId = row.subjectId || ids.value
-  getSubject(_subjectId).then(response => {
-    form.value = response.data
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map(item => item.subjectId)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
+  }
+
+  /** 新增按钮操作 */
+  function handleAdd() {
+    reset()
     open.value = true
-    title.value = "修改科目"
-  })
-}
+    title.value = "添加科目"
+  }
 
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["subjectRef"].validate(valid => {
-    if (valid) {
-      if (form.value.subjectId != null) {
-        updateSubject(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addSubject(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
+  /** 修改按钮操作 */
+  function handleUpdate(row) {
+    reset()
+    const _subjectId = row.subjectId || ids.value
+    getSubject(_subjectId).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改科目"
+    })
+  }
+
+  /** 提交按钮 */
+  function submitForm() {
+    proxy.$refs["subjectRef"].validate(valid => {
+      if (valid) {
+        if (form.value.subjectId != null) {
+          updateSubject(form.value).then(response => {
+            proxy.$modal.msgSuccess("修改成功")
+            open.value = false
+            getList()
+          })
+        } else {
+          addSubject(form.value).then(response => {
+            proxy.$modal.msgSuccess("新增成功")
+            open.value = false
+            getList()
+          })
+        }
       }
-    }
-  })
-}
+    })
+  }
 
-/** 删除按钮操作 */
-function handleDelete(row) {
-  const _subjectIds = row.subjectId || ids.value
-  proxy.$modal.confirm('是否确认删除科目编号为"' + _subjectIds + '"的数据项？').then(function() {
-    return delSubject(_subjectIds)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
-}
+  /** 删除按钮操作 */
+  function handleDelete(row) {
+    const _subjectIds = row.subjectId || ids.value
+    proxy.$modal.confirm('是否确认删除科目编号为"' + _subjectIds + '"的数据项？').then(function() {
+      return delSubject(_subjectIds)
+    }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+    }).catch(() => {})
+  }
 
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('dz/subject/export', {
-    ...queryParams.value
-  }, `subject_${new Date().getTime()}.xlsx`)
-}
+  /** 导出按钮操作 */
+  function handleExport() {
+    proxy.download('dz/subject/export', {
+      ...queryParams.value
+    }, `subject_${new Date().getTime()}.xlsx`)
+  }
 
-getList()
+  getList()
 </script>

ie-system/src/main/resources/mapper/dz/DzSubjectMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.dz.mapper.DzSubjectMapper">
-    
+
     <resultMap type="DzSubject" id="DzSubjectResult">
         <result property="subjectId"    column="subject_id"    />
         <result property="subjectName"    column="subject_name"    />
@@ -19,15 +19,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectDzSubjectList" parameterType="DzSubject" resultMap="DzSubjectResult">
         <include refid="selectDzSubjectVo"/>
-        <where>  
+        <where>
             <if test="subjectName != null  and subjectName != ''"> and subject_name like concat('%', #{subjectName}, '%')</if>
             <if test="pinyin != null  and pinyin != ''"> and pinyin = #{pinyin}</if>
             <if test="sort != null "> and sort = #{sort}</if>
             <if test="locations != null  and locations != ''"> and locations = #{locations}</if>
-            <if test="examTypes != null  and examTypes != ''"> and exam_types = #{examTypes}</if>
+            <if test="examTypes != null  and examTypes != ''"> and exam_types  like concat('%', #{examTypes}, '%') </if>
         </where>
     </select>
-    
+
     <select id="selectDzSubjectBySubjectId" parameterType="Long" resultMap="DzSubjectResult">
         <include refid="selectDzSubjectVo"/>
         where subject_id = #{subjectId}
@@ -70,9 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDzSubjectBySubjectIds" parameterType="String">
-        delete from dz_subject where subject_id in 
+        delete from dz_subject where subject_id in
         <foreach item="subjectId" collection="array" open="(" separator="," close=")">
             #{subjectId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ie-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -14,9 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
 	</resultMap>
-	
+
 	<sql id="selectDictTypeVo">
-        select dict_id, dict_name, dict_type, status, create_by, create_time, remark 
+        select dict_id, dict_name, dict_type, status, create_by, create_time, remark
 		from sys_dict_type
     </sql>
 
@@ -39,36 +39,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 			</if>
 	    </where>
+		order by dict_id desc
 	</select>
-	
+
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 	</select>
-	
+
 	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_id = #{dictId}
 	</select>
-	
+
 	<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_type = #{dictType}
 	</select>
-	
+
 	<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
 		where dict_type = #{dictType} limit 1
 	</select>
-	
+
 	<delete id="deleteDictTypeById" parameterType="Long">
  		delete from sys_dict_type where dict_id = #{dictId}
  	</delete>
- 	
+
  	<delete id="deleteDictTypeByIds" parameterType="Long">
  		delete from sys_dict_type where dict_id in
  		<foreach collection="array" item="dictId" open="(" separator="," close=")">
  			#{dictId}
-        </foreach> 
+        </foreach>
  	</delete>
 
  	<update id="updateDictType" parameterType="SysDictType">
@@ -83,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where dict_id = #{dictId}
 	</update>
- 	
+
  	<insert id="insertDictType" parameterType="SysDictType">
  		insert into sys_dict_type(
  			<if test="dictName != null and dictName != ''">dict_name,</if>
@@ -101,5 +102,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
-</mapper> 
+
+</mapper>