From 5969c498a9be734fa474994c9cd9cb29f7b2713b Mon Sep 17 00:00:00 2001 From: yangdj <18302547071@163> Date: Sat, 18 Mar 2023 01:25:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=9A=84=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E3=80=81=E4=BF=AE=E6=94=B9=E5=8F=8A=E8=AF=84=E8=AF=AD?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/entity/StudentHandsOnTaskReport.java | 6 +++--- .../StudentHandsOnTaskReportService.java | 20 +++++++++++-------- .../query/StudentHandsOnTaskReportQuery.java | 6 +++--- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReport.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReport.java index a8005e04..5b1defe1 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReport.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentHandsOnTaskReport.java @@ -53,7 +53,7 @@ public class StudentHandsOnTaskReport extends BaseEntity{ //报告评语 - private BigDecimal reportComment ; + private String reportComment ; //创建时间 @@ -176,13 +176,13 @@ public class StudentHandsOnTaskReport extends BaseEntity{ /**报告评语 *@return */ - public BigDecimal getReportComment(){ + public String getReportComment(){ return reportComment; } /**报告评语 *@param reportComment */ - public void setReportComment(BigDecimal reportComment){ + public void setReportComment(String reportComment){ this.reportComment = reportComment; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java index 53b910eb..22a27fa4 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskReportService.java @@ -154,11 +154,13 @@ public class StudentHandsOnTaskReportService extends CoreBaseService list = studentHandsOnTaskReportDao.getValuesByQuery(studentHandsOnTaskReportQuery); if(null != list && list.size()>0){ return list.get(0); diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java index 93bf8c9e..1dac8ba8 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/StudentHandsOnTaskReportQuery.java @@ -30,7 +30,7 @@ public class StudentHandsOnTaskReportQuery extends PageParam { @Query(name = "报告分值", display = false) private BigDecimal reportScore; @Query(name = "报告评语", display = false) - private BigDecimal reportComment; + private String reportComment; @Query(name = "创建时间", display = false) private Date createTime; @Query(name = "组织ID", display = false) @@ -124,10 +124,10 @@ public class StudentHandsOnTaskReportQuery extends PageParam { public void setReportScore(BigDecimal reportScore ){ this.reportScore = reportScore; } - public BigDecimal getReportComment(){ + public String getReportComment(){ return reportComment; } - public void setReportComment(BigDecimal reportComment ){ + public void setReportComment(String reportComment ){ this.reportComment = reportComment; } public Date getCreateTime(){ From aaadccfaa48f0d698c4b076d5aa28badb084f085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com> Date: Sat, 18 Mar 2023 02:26:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/layui-icon-extend/demo_index.html | 52 ++- .../modules/layui-icon-extend/iconfont.css | 14 +- .../css/modules/layui-icon-extend/iconfont.js | 2 +- .../modules/layui-icon-extend/iconfont.json | 14 + .../modules/layui-icon-extend/iconfont.ttf | Bin 14292 -> 14512 bytes .../modules/layui-icon-extend/iconfont.woff | Bin 8880 -> 9024 bytes .../modules/layui-icon-extend/iconfont.woff2 | Bin 6696 -> 6808 bytes .../common/tag/submitButtons.tag.html | 2 +- .../templates/jlw/schoolClass/add.html | 2 +- .../add.html | 422 ++++++++++-------- 10 files changed, 320 insertions(+), 188 deletions(-) diff --git a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/demo_index.html b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/demo_index.html index 76d542eb..66821e49 100644 --- a/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/demo_index.html +++ b/admin-core/src/main/resources/static/plugins/layui/css/modules/layui-icon-extend/demo_index.html @@ -56,6 +56,18 @@
-
-
-
- -
- - -
${universitiesCollegesName}
- - - - - -
-
-
-
- 实验系统： - + +
+ + +
${universitiesCollegesName} +
+ + + + + +
+
+
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
应用名称使用层次开始时间结束时间子系统
登录页logo设计		子系统logo设计子系统底栏名称
-
- -
-
-
- 课程资源： - + + + {{# }); }} + {{# if(d.list.length <= 0){ }} + + +
无数据
+ + + {{# } }} + +
-
-
-
- - - - - - - - - - - - - - - - - - - - - - -
课程名称使用层次开始时间结束时间二级课程名设置二级课程logo设置
-
-
+
+
+
+ 课程资源： + +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
课程名称使用层次开始时间结束时间二级课程名设置二级课程logo设置
+
+
    +
    • +
  • +
    • +
+
+ +
+ + \ No newline at end of file