From 5969c498a9be734fa474994c9cd9cb29f7b2713b Mon Sep 17 00:00:00 2001
From: yangdj <18302547071@163>
Date: Sat, 18 Mar 2023 01:25:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=9A=84=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E5=8F=8A=E8=AF=84=E8=AF=AD=E5=AD=97?=
 =?UTF-8?q?=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<StudentHand
     }
 
     public String edit(StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, CoreUser coreUser){
-        if (!coreUser.isStudent()) {
+        if (!coreUser.isStudent() && studentHandsOnTaskReportQuery.getStudentId() == null) {
             return null;
         }
-        Student student = studentService.getByUserId(coreUser.getId());
-        studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
+        if(studentHandsOnTaskReportQuery.getStudentId() == null){
+            Student student = studentService.getByUserId(coreUser.getId());
+            studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
+        }
         if (studentHandsOnTaskReportQuery.getHandsOnTaskId() ==null) {
             return null;
         }
@@ -206,14 +208,16 @@ public class StudentHandsOnTaskReportService extends CoreBaseService<StudentHand
     }
 
     public StudentHandsOnTaskReport getInfo (StudentHandsOnTaskReportQuery studentHandsOnTaskReportQuery, CoreUser coreUser){
-        if (!coreUser.isStudent()) {
+        if (!coreUser.isStudent() && studentHandsOnTaskReportQuery.getStudentId() == null) {
             return null;
         }
-        if (studentHandsOnTaskReportQuery.getHandsOnTaskId() == null) {
-            return null;
+//        if (studentHandsOnTaskReportQuery.getHandsOnTaskId() == null) {
+//            return null;
+//        }
+        if(studentHandsOnTaskReportQuery.getStudentId() == null){
+            Student student = studentService.getByUserId(coreUser.getId());
+            studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
         }
-        Student student = studentService.getByUserId(coreUser.getId());
-        studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
         List<StudentHandsOnTaskReport> 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(){