报告的添加、修改及评语字段类型错误

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;
     }
 

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());
+        if(studentHandsOnTaskReportQuery.getStudentId() == null){
-        studentHandsOnTaskReportQuery.setStudentId(student.getStudentId());
+            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) {
+//        if (studentHandsOnTaskReportQuery.getHandsOnTaskId() == null) {
-            return 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);

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(){