优化

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

@@ -25,10 +25,10 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="开班年份" prop="year">
+      <el-form-item label="毕业年份" prop="year">
         <el-input
                 v-model="queryParams.year"
-                placeholder="请输入开班年份"
+                placeholder="请输入毕业年份"
                 clearable
                 @keyup.enter="handleQuery"
         />
@@ -113,7 +113,7 @@
       <el-table-column label="名称" align="center" prop="name" />
 <!--      <el-table-column label="学校" align="center" prop="schoolId" />-->
       <el-table-column label="学校" align="center" prop="school.name" />
-      <el-table-column label="开班年份" align="center" prop="year" />
+      <el-table-column label="毕业年份" align="center" prop="year" />
       <el-table-column label="是否线上" align="center" prop="online">
         <template #default="scope">
           <dict-tag :options="bool_values" :value="scope.row.online"/>
@@ -160,8 +160,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="开班年份" prop="year">
-          <el-input v-model="form.year" placeholder="请输入开班年份" />
+        <el-form-item label="毕业年份" prop="year">
+          <el-input v-model="form.year" placeholder="请输入毕业年份" />
         </el-form-item>
 
         <el-form-item label="是否线上" prop="online">

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

@@ -3,17 +3,17 @@
     <el-row :gutter="20">
       <splitpanes :horizontal="appStore.device === 'mobile'" class="default-theme">
         <!--机构数据-->
-        <pane size="16">
-          <el-col>
-            <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入机构名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />
-            </div>
-            <div class="head-container">
-              <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />
-            </div>
-          </el-col>
-        </pane>
-        <pane size="84">
+<!--        <pane size="16">-->
+<!--          <el-col>-->
+<!--            <div class="head-container">-->
+<!--              <el-input v-model="deptName" placeholder="请输入机构名称" clearable prefix-icon="Search" style="margin-bottom: 20px" />-->
+<!--            </div>-->
+<!--            <div class="head-container">-->
+<!--              <el-tree :data="deptOptions" :props="{ label: 'label', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode" ref="deptTreeRef" node-key="id" highlight-current default-expand-all @node-click="handleNodeClick" />-->
+<!--            </div>-->
+<!--          </el-col>-->
+<!--        </pane>-->
+        <pane size="100">
           <el-col>
             <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
               <el-form-item label="名称" prop="name">
@@ -98,13 +98,8 @@
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column label="ID" align="center" prop="id" />
               <el-table-column label="名称" align="center" prop="name" />
-<!--              <el-table-column label="机构ID" align="center" prop="deptId" />-->
-              <el-table-column label="归属机构" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
+<!--              <el-table-column label="归属机构" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />-->
               <el-table-column label="省份" align="center" prop="location" />
-
-<!--              <el-table-column label="省" align="center" prop="pro" />-->
-<!--              <el-table-column label="市" align="center" prop="city" />-->
-<!--              <el-table-column label="区" align="center" prop="area" />-->
               <el-table-column label="所属地区" align="center" prop="proCityAreaName" />
               <el-table-column label="状态" align="center" prop="status">
                 <template #default="scope">
@@ -138,27 +133,15 @@
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入名称" />
         </el-form-item>
-<!--        <el-form-item label="机构ID" prop="deptId">-->
-<!--          <el-input v-model="form.deptId" placeholder="请输入机构ID" />-->
+<!--        <el-form-item label="归属机构" prop="deptId">-->
+<!--          <el-tree-select v-model="form.deptId" :data="enabledDeptOptions" :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属机构" clearable check-strictly />-->
 <!--        </el-form-item>-->
-        <el-form-item label="归属机构" prop="deptId">
-          <el-tree-select v-model="form.deptId" :data="enabledDeptOptions" :props="{ value: 'id', label: 'label', children: 'children' }" value-key="id" placeholder="请选择归属机构" clearable check-strictly />
-        </el-form-item>
         <el-form-item label="省份" prop="location">
           <el-input v-model="form.location" placeholder="请输入省份" />
         </el-form-item>
         <el-form-item label="省市区" prop="areaIds" style="width: 220px;">
           <AddressSelect class="w-[198px]" v-model="areaIds" />
         </el-form-item>
-<!--        <el-form-item label="省" prop="pro">-->
-<!--          <el-input v-model="form.pro" placeholder="请输入省" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="市" prop="city">-->
-<!--          <el-input v-model="form.city" placeholder="请输入市" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="区" prop="area">-->
-<!--          <el-input v-model="form.area" placeholder="请输入区" />-->
-<!--        </el-form-item>-->
         <el-form-item label="状态" prop="status">
           <el-select v-model="form.status" placeholder="请选择状态">
             <el-option

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

@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="refundTime != null "> and refund_time = #{refundTime}</if>
             <if test="closeTime != null "> and close_time = #{closeTime}</if>
         </where>
+        order by card_id desc
     </select>
 
     <select id="selectDzCardsByCardId" parameterType="Long" resultMap="DzCardsResult">

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

@@ -31,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="schoolId != null "> and t1.school_id = #{schoolId}</if>
             <if test="name != null  and name != ''"> and t1.name like concat('%', #{name}, '%')</if>
         </where>
+        order by t1.teacher_id desc
     </select>
 
     <select id="selectDzTeacherByTeacherId" parameterType="Long" resultMap="DzTeacherResult">