yangjun
/
DBSD_ZJPT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2025-03-21 16:17:06 +08:00
parent 4d4509f407
commit 5ae64cc5fd
14 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java
View File

@ -31,14 +31,14 @@ public class Xxhbjwxtjxrw implements Serializable {
private static final long serialVersionUID = 1L;
/**学年学期*/
@ApiModelProperty(value = "学年学期")
private java.lang.String xnxqdm;
@Excel(name = "学年学期", width = 15)
private String xnxqmc;
/**xn*/
@Excel(name = "学年", width = 15)
@ApiModelProperty(value = "学年")
private java.lang.String xn;
/**xqmc*/
@Excel(name = "学期", width = 15)
@ApiModelProperty(value = "学期")
private java.lang.String xqmc;
/**kcmc*/

2
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="org.jeecg.modules.demo.xxhbjwxtjxrw.mapper.XxhbjwxtjxrwMapper">
<select id="selectList" resultType="org.jeecg.modules.demo.xxhbjwxtjxrw.entity.Xxhbjwxtjxrw">
select a.kcrwdm as id,a.XNXQDM,a.KCMC,a.KCRWDM,a.KCLB,a.XF,a.ZXS,a.KKYXMC,a.TEAXM,a.BJXX,a.XN,a.XQMC,a.SJFS,a.KHFSMC,a.IS_UPLOAD_SJ,a.ZYMC,a.JXBRS,a.FILE_SHZTMC,concat(a.xn,a.xqmc) as zjxnxq,IF(b.id is null,'0',b.id) sfzs from xxhbjwxtjxrw a
select a.kcrwdm as id,a.XNXQDM,a.KCMC,a.KCRWDM,a.KCLB,a.XF,a.ZXS,a.KKYXMC,a.TEAXM,a.BJXX,a.XN,a.XQMC,a.SJFS,a.KHFSMC,a.IS_UPLOAD_SJ,a.ZYMC,a.JXBRS,a.FILE_SHZTMC,concat(a.xn,a.xqmc) as zjxnxq,IF(b.id is null,'0',b.id) sfzs,a.xnxqmc from xxhbjwxtjxrw a
left join bl_clsfzs b on a.kcrwdm = b.kcrwdm
${ew.customSqlSegment}
</select>

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

@ -111,9 +111,9 @@ public class XxhbjwxtscwjxxController extends JeecgController<Xxhbjwxtscwjxx, IX
List<Xxhbjwxtscwjxx> list = pageList.getRecords();
if(list.size()>0){
List<Xxhbjwxtscwjxx> list2 = new ArrayList<>();
String sorts[] = ("历次过程性考核-评分标准,历次过程性考核-内容及要求（或试题）,课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题（或内容及要求）,课程考核质量评价单,课程目标达成情况评价报告,课程教学大纲,bl1-评分依据/标准,bl2-评分依据/标准,bl3-评分依据/标准,bl4-评分依据/标准,bl5-评分依据/标准,bl1-空白试卷或试卷描述,bl2-空白试卷或试卷描述,bl3-空白试卷或试卷描述,bl4-空白试卷或试卷描述,bl5-空白试卷或试卷描述").split(",");
String sorts[] = ("bl0-pfbz,bl0-zyyq,bl1-pfbz,bl0-zyyq,bl2-pfbz,bl0-zyyq,bl3-pfbz,bl0-zyyq,bl4-pfbz,bl0-zyyq,bl5-pfbz,bl0-zyyq,qt-01,qt-02,qt-03,qt-04,qt-05,qt-06,qt-07,qt-08").split(",");
for (String par : sorts){
list2.add(list.stream().filter(item->item.getFjtype().equals(par)).findFirst().orElse(null));
list2.add(list.stream().filter(item->item.getType().equals(par)).findFirst().orElse(null));
}
pageList.setRecords(list2.stream().filter(list3 -> list3!=null).collect(Collectors.toList()));

1
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java
View File

@ -54,6 +54,7 @@ public class Xxhbjwxtscwjxx implements Serializable {
@Excel(name = "附件类型", width = 15)
@ApiModelProperty(value = "附件类型")
private String fjtype;
private String type;
@TableField(exist = false)
private String id;

4
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/mapper/xml/XxhbjwxtscwjxxMapper.xml
View File

@ -5,9 +5,9 @@
<select id="khclList" resultType="org.jeecg.modules.demo.xxhbjwxtscwjxx.entity.Xxhbjwxtscwjxx">
select * from (
SELECT kcrwdm, name, path, cjr, cjsj, fjtype FROM xxhbjwxtscwjxx
SELECT kcrwdm, name, path, cjr, cjsj, fjtype,type FROM xxhbjwxtscwjxx
union all
SELECT kcrwdm, create_by as name, bl_file_path as path, '专家平台补录' as cjr, create_time as cjsj, bl_type as fjtype FROM bl_kckhclbl
SELECT kcrwdm, create_by as name, bl_file_path as path, '专家平台补录' as cjr, create_time as cjsj, bl_type as fjtype,'qt-08' as type FROM bl_kckhclbl
) t
${ew.customSqlSegment}

1
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/zjXkxx/entity/ZjXkxx.java
View File

@ -71,6 +71,7 @@ public class ZjXkxx implements Serializable {
private java.lang.String zxs;//学时
private java.lang.String zymc;//专业名称
private java.lang.String jxbrs;//选课人数
private java.lang.String xnxqmc;//学年学期名称
@TableField(exist = false)

4
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/Xxhbjwxtjxrw.data.ts
View File

@ -162,7 +162,7 @@ export const columns2: BasicColumn[] = [
{
title: '学年学期',
align: "center",
dataIndex: 'zjxnxq_dictText',
dataIndex: 'xnxqmc',
ellipsis: true,
},
{
@ -265,7 +265,7 @@ export const columns3: BasicColumn[] = [
{
title: '学年学期',
align: "center",
dataIndex: 'zjxnxq_dictText'
dataIndex: 'xnxqmc'
},
{
title: '课程名称',

2
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XxhbjwxtjxrwList3.vue
View File

@ -163,7 +163,7 @@
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">课程考核材料详情 </span> </a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo?.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
{{ jxrwInfo?.value.xnxqmc }}《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left:16px;font-size:16px; font-weight: 700">概要信息</div>

2
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList copy 2.vue
View File

@ -164,7 +164,7 @@
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">课程考核材料详情 </span> </a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo?.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
{{ jxrwInfo?.value.xnxqmc }}《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left:16px;font-size:16px; font-weight: 700">概要信息</div>

2
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList copy.vue
View File

@ -185,7 +185,7 @@
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">课程考核材料详情 </span> </a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo?.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
{{ jxrwInfo?.value.xnxqmc}}《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left:16px;font-size:16px; font-weight: 700">概要信息</div>

4
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/XzkckhclList.vue
View File

@ -181,10 +181,10 @@
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="query-criteria">
<a-row :gutter="24" v-if="jxrwInfo?.value">
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">课程考核材料详情 </span> </a-col>
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">课程考核3材料详情 </span> </a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo?.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
{{ jxrwInfo?.value.xnxqmc }}《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left:16px;font-size:16px; font-weight: 700">概要信息</div>

2
jeecgboot-vue3/src/views/bl/xxhbjwxtjxrw/components/XxhbjwxtjxrwForm.vue
View File

@ -6,7 +6,7 @@
<a-col :span="12"><span class="seleciton-line">1</span> <span class="selection-title">课程考核材料详情 </span> </a-col>
<a-col :gutter="24">
<div style="text-align: center; font-size:24px; font-weight: 700; line-height: 50px" v-if="jxrwInfo?.value">
{{ jxrwInfo?.value.xn }}{{ jxrwInfo?.value.xqmc }}学期《{{ jxrwInfo?.value.kcmc }}》
{{ jxrwInfo?.value.xnxqmc }}《{{ jxrwInfo?.value.kcmc }}》
</div>
<div v-if="jxrwInfo.value">
<div style="padding-left:16px;font-size:16px; font-weight: 700">概要信息</div>

2
jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/KhpjclList.vue
View File

@ -225,7 +225,7 @@ function searchReset() {
function init(record) {
queryParam.kcrwdm = record.kcrwdm;
queryParam.fjtype = '历次过程性考核-评分标准,历次过程性考核-内容及要求（或试题）,课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题（或内容及要求）,课程考核质量评价单,课程目标达成情况评价报告,课程教学大纲,bl1-评分依据/标准,bl2-评分依据/标准,bl3-评分依据/标准,bl4-评分依据/标准,bl5-评分依据/标准,bl1-空白试卷或试卷描述,bl2-空白试卷或试卷描述,bl3-空白试卷或试卷描述,bl4-空白试卷或试卷描述,bl5-空白试卷或试卷描述';
queryParam.type = 'bl0-pfbz,bl0-zyyq,bl1-pfbz,bl0-zyyq,bl2-pfbz,bl0-zyyq,bl3-pfbz,bl0-zyyq,bl4-pfbz,bl0-zyyq,bl5-pfbz,bl0-zyyq,qt-01,qt-02,qt-03,qt-04,qt-05,qt-06,qt-07,qt-08';
// 平时成绩
// 期末成绩
// 期中成绩

2
jeecgboot-vue3/src/views/bl/xxhbjwxtscwjxx/XxhbjwxtscwjxxList.vue
View File

@ -272,7 +272,7 @@ function searchReset() {
function init(record) {
queryParam.kcrwdm = record.kcrwdm;
queryParam.fjtype = '历次过程性考核-评分标准,历次过程性考核-内容及要求（或试题）,课程考核合理性审核记录单,期末考试-评分标准,期未考试-试题（或内容及要求）,课程考核质量评价单,课程目标达成情况评价报告,课程教学大纲,bl1-评分依据/标准,bl2-评分依据/标准,bl3-评分依据/标准,bl4-评分依据/标准,bl5-评分依据/标准,bl1-空白试卷或试卷描述,bl2-空白试卷或试卷描述,bl3-空白试卷或试卷描述,bl4-空白试卷或试卷描述,bl5-空白试卷或试卷描述';
queryParam.type = 'bl0-pfbz,bl0-zyyq,bl1-pfbz,bl0-zyyq,bl2-pfbz,bl0-zyyq,bl3-pfbz,bl0-zyyq,bl4-pfbz,bl0-zyyq,bl5-pfbz,bl0-zyyq,qt-01,qt-02,qt-03,qt-04,qt-05,qt-06,qt-07,qt-08';
// 平时成绩
// 期末成绩
// 期中成绩