还原冲突文件导致页面的变动

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java

@@ -1,10 +1,7 @@
 package org.jeecg.modules.demo.xxhbjwxtscwjxx.controller;
 
 import java.io.*;
-import java.util.Arrays;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 import java.net.URLDecoder;
 import java.util.zip.ZipEntry;
@@ -90,6 +87,32 @@ public class XxhbjwxtscwjxxController extends JeecgController<Xxhbjwxtscwjxx, IX
 		return Result.OK(pageList);
 	}
 
+
+	 @ApiOperation(value="教务系统上传文件信息-分页列表查询", notes="教务系统上传文件信息-分页列表查询")
+	 @GetMapping(value = "/khcllist")
+	 public Result<IPage<Xxhbjwxtscwjxx>> khcllist(Xxhbjwxtscwjxx xxhbjwxtscwjxx,
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		 QueryWrapper<Xxhbjwxtscwjxx> queryWrapper = QueryGenerator.initQueryWrapper(xxhbjwxtscwjxx, req.getParameterMap());
+		 Page<Xxhbjwxtscwjxx> page = new Page<Xxhbjwxtscwjxx>(pageNo, pageSize);
+		 IPage<Xxhbjwxtscwjxx> pageList = xxhbjwxtscwjxxService.page(page, queryWrapper);
+
+		 List<Xxhbjwxtscwjxx> list = pageList.getRecords();
+		 if(list.size()>0){
+			 List<Xxhbjwxtscwjxx> list2 = new ArrayList<>();
+			 String sorts[] = ("课程考核合理性审核记录单,课程目标达成情况评价报告,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准,历次过程性考核-内容及要求（或试题）,历次过程性考核-评分标准").split(",");
+			 for (String par : sorts){
+				 list2.add(list.stream().filter(item->item.getFjtype().equals(par)).findFirst().orElse(null));
+			 }
+			 pageList.setRecords(list2);
+			 pageList.getRecords().forEach(item->{
+				 item.setId(item.getPath());
+			 });
+		 }
+		 return Result.OK(pageList);
+	 }
+	
 	/**
 	 *   添加
 	 *

jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue

@@ -13,17 +13,17 @@
         <a-form ref="formRef" @keyup.enter.native="searchQuery2" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
           <a-row :gutter="24">
             <a-col :lg="6">
-              <a-form-item name="xn">
+              <a-form-item name="zjxnxq">
-                <template #label><span title="学年" class="xn-title">学年</span></template>
+                <template #label><span title="学年学期" class="xn-title">学年学期</span></template>
-                <j-dict-select-tag  placeholder="请选择学年" v-model:value="queryParam2.xn" :dictCode="`v_xn,xn,xn`" allow-clear />
+                <j-dict-select-tag  placeholder="请选择学年学期" v-model:value="queryParam2.zjxnxq" :dictCode="`v_xqxn,xqxn,xqxn`" allow-clear />
               </a-form-item>
             </a-col>
-            <a-col :lg="6">
+            <!-- <a-col :lg="6">
               <a-form-item name="xqmc">
                 <template #label><span title="学期" class="xn-title">学期</span></template>
                 <j-dict-select-tag placeholder="请选择学期" v-model:value="queryParam2.xqmc" dictCode="cjxq" allow-clear />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :lg="6">
               <a-form-item name="kkyxmc">
                 <template #label><span title="开课单位名称" class="xn-title">开课单位名称</span></template>
@@ -63,7 +63,7 @@
                 />
               </a-form-item>
             </a-col>
-            <a-col :span="12" style="text-align: right">
+            <a-col :span="18" style="text-align: right">
               <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery2">查询</a-button>
             </a-col>
           </a-row>
@@ -133,6 +133,12 @@
               </a-popover>
             </a-col> -->
             <a-col :lg="6">
+              <a-form-item name="zjxnxq">
+                <template #label><span title="学年学期" class="xn-title">学年学期</span></template>
+                <j-dict-select-tag  placeholder="请选择学年学期" v-model:value="queryParam.zjxnxq" :dictCode="`v_xqxn,xqxn,xqxn`" allow-clear />
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :lg="6">
               <a-form-item name="xn">
                 <template #label><span title="学年" class="xn-title">学年</span></template>
                 <j-dict-select-tag placeholder="请选择学年" v-model:value="queryParam.xn" :dictCode="`v_xn,xn,xn`" allow-clear />
@@ -143,7 +149,7 @@
                 <template #label><span title="学期" class="xn-title">学期</span></template>
                 <j-dict-select-tag placeholder="请选择学期" v-model:value="queryParam.xqmc" dictCode="cjxq" allow-clear />
               </a-form-item>
-            </a-col>
+            </a-col> -->
             <a-col :lg="6">
               <a-form-item name="kkyxmc">
                 <template #label><span title="开课单位名称" class="xn-title">开课单位名称</span></template>
@@ -190,7 +196,7 @@
                   <j-input placeholder="请输入课程名称" v-model:value="queryParam.kcmc" allow-clear ></j-input>
                 </a-form-item>
               </a-col> -->
-            <a-col :span="12" style="text-align: right">
+            <a-col :span="18" style="text-align: right">
               <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
               <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
               <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" style="margin-left: 8px"> 导出</a-button>
@@ -406,7 +412,7 @@ function handleSuccess() {
 function getTableAction(record) {
   return [
     {
-      label: '成绩单',
+      label: '学生成绩',
       onClick: handleCjd.bind(null, record),
     },
     {

jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/Xxhbjwxtscwjxx.api.ts

@@ -5,6 +5,7 @@ const { createConfirm } = useMessage();
 
 enum Api {
   list = '/xxhbjwxtscwjxx/xxhbjwxtscwjxx/list',
+  khcllist = '/xxhbjwxtscwjxx/xxhbjwxtscwjxx/khcllist',
   save='/xxhbjwxtscwjxx/xxhbjwxtscwjxx/add',
   edit='/xxhbjwxtscwjxx/xxhbjwxtscwjxx/edit',
   deleteOne = '/xxhbjwxtscwjxx/xxhbjwxtscwjxx/delete',
@@ -29,6 +30,7 @@ export const getImportUrl = Api.importExcel;
  * @param params
  */
 export const list = (params) => defHttp.get({ url: Api.list, params });
+export const khcllist = (params) => defHttp.get({ url: Api.khcllist, params });
 
 /**
  * 删除单个

jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue

@@ -56,7 +56,7 @@ import { ref, reactive } from 'vue';
 import { BasicTable, useTable, TableAction } from '/@/components/Table';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { columns, superQuerySchema } from './Xxhbjwxtscwjxx.data';
-import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Xxhbjwxtscwjxx.api';
+import { khcllist, deleteOne, batchDelete, getImportUrl, getExportUrl } from './Xxhbjwxtscwjxx.api';
 import { downloadFile,downloadFileLoacl } from '/@/utils/common/renderUtils';
 import XxhbjwxtscwjxxModal from './components/XxhbjwxtscwjxxModal.vue';
 import { useUserStore } from '/@/store/modules/user';
@@ -77,7 +77,7 @@ const emit = defineEmits(['callback']);
 //注册table数据
 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
   tableProps: {
-    api: list,
+    api: khcllist,
     columns,
     canResize: false,
     useSearchForm: false,
@@ -257,8 +257,7 @@ function searchReset() {
 
 function init(record) {
   queryParam.kcrwdm = record.kcrwdm;
-  queryParam.fjtype =
+  queryParam.fjtype = '课程考核合理性审核记录单,课程目标达成情况评价报告,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准,历次过程性考核-内容及要求（或试题）,历次过程性考核-评分标准';
-    '历次过程性考核-评分标准,课程目标达成情况评价报告,课程考核合理性审核记录单,历次过程性考核-内容及要求（或试题）,课程考核质量评价单,期未考试-试题（或内容及要求）,期末考试-评分标准';
   //   平时成绩
   // 期末成绩
   // 期中成绩

jeecgboot-vue3/src/views/bl/xxhbjwxtxsmd/Xxhbjwxtxsmd.data.ts

@@ -286,24 +286,21 @@ export const columns3: BasicColumn[] = [
     align: "center",
     dataIndex: 'cj1',
     width: 100,
-    // defaultHidden: ({text}) =>{
+    defaultHidden: true,
-    //   if(text){
-
-    //   }
-    //   return true;
-    // },
   },
   {
     title: '平时成绩2',
     align: "center",
     dataIndex: 'cj2',
     width: 100,
+    defaultHidden: true,
   },
   {
     title: '平时成绩3',
     align: "center",
     dataIndex: 'cj3',
     width: 100,
+    defaultHidden: true,
   },
   {
     title: '期中成绩',