diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java index e4d90ad..f3dcfe0 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/entity/Xxhbjwxtjxrw.java @@ -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*/ diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml index 76aa694..c24ed65 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/mapper/xml/XxhbjwxtjxrwMapper.xml @@ -3,7 +3,7 @@ diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java index e87a1a8..d40b98a 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/controller/XxhbjwxtscwjxxController.java @@ -111,9 +111,9 @@ public class XxhbjwxtscwjxxController extends JeecgController list = pageList.getRecords(); if(list.size()>0){ List 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())); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java index 1ce5f0e..e082bd4 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/entity/Xxhbjwxtscwjxx.java @@ -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; diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/mapper/xml/XxhbjwxtscwjxxMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/mapper/xml/XxhbjwxtscwjxxMapper.xml index bf53b65..e158af8 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/mapper/xml/XxhbjwxtscwjxxMapper.xml +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtscwjxx/mapper/xml/XxhbjwxtscwjxxMapper.xml @@ -5,9 +5,9 @@