Merge branches 'dev_aliyun' and 'issues25489' of https://bdgit.educoder.net/Hjqreturn/educoder into issues25489

app/controllers/courses_controller.rb

@@ -288,11 +288,11 @@ class CoursesController < ApplicationController
     inform = @course.informs.find_by(id: params[:inform_id])
     next_inform = inform.next_inform
     ActiveRecord::Base.transaction do
-      if next_inform
+      if next_inform.blank?
         render_error('已经到达最顶部')
       else
-        inform.update_attribute(:position, (position + 1))
-        next_inform.update_attribute(:position, last_inform.position - 1)
+        inform.update_attribute(:position, (inform.position + 1))
+        next_inform.update_attribute(:position, inform.position - 1)
         render_ok
       end
     end
@@ -302,11 +302,11 @@ class CoursesController < ApplicationController
     inform = @course.informs.find_by(id: params[:inform_id])
     last_inform = inform.last_inform
     ActiveRecord::Base.transaction do
-      if last_inform
+      if last_inform.blank?
         render_error('已经到达最底部')
       else
-        inform.update_attribute(:position, (position - 1))
-        last_inform.update_attribute(:position, last_inform.position + 1)
+        inform.update_attribute(:position, (inform.position - 1))
+        last_inform.update_attribute(:position, inform.position + 1)
         render_ok
       end
     end
@@ -317,7 +317,7 @@ class CoursesController < ApplicationController
     inform = Inform.new(container: @course)
     inform.name = params[:name]
     inform.description = params[:description]
-    inform.position = @course.informs.maximum(:position) + 1
+    inform.position = @course.informs.maximum(:position).to_i + 1
     inform.save!
     normal_status("创建成功")
   end

app/models/inform.rb

@@ -7,11 +7,11 @@ class Inform < ApplicationRecord
   has_many :attachments, as: :container, dependent: :destroy
 
   def next_inform
-    Inform.where(position: self.position+1, container_id: self.course_id, container_type: 'Course')
+    Inform.where(position: self.position+1, container_id: self.container_id, container_type: self.container_type)
   end
 
   def  last_inform
-    Inform.where(position: self.position-1, container_id: self.course_id, container_type: 'Course')
+    Inform.where(position: self.position-1, container_id: self.container_id, container_type: self.container_type)
   end
 
 end

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -1175,8 +1175,9 @@ class Listofworksstudentone extends Component {
 					className: 'font-14',
 					render: (text, record) => (
 						record.submitstate === "未提交" ?
-							<span style={{textAlign: "center", cursor: "pointer"}} className="color-blue"
-										onClick={() => this.Adjustment(record)}>调分</span> :
+							<a style={{textAlign: "center"}} className="color-blue"
+								 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
+								 onClick={() => this.Viewstudenttraininginformationt(record)}>查看</a> :
 							<span>
                        <a style={{textAlign: "center"}} className="color-blue"
 													onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
@@ -1508,8 +1509,9 @@ class Listofworksstudentone extends Component {
 					className: 'font-14',
 					render: (text, record) => (
 						record.submitstate === "未提交" ?
-							<span style={{textAlign: "center", cursor: "pointer"}} className="color-blue"
-										onClick={() => this.Adjustment(record)}>调分</span> :
+							<a style={{textAlign: "center"}} className="color-blue"
+								 onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
+								 onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a> :
 							<span>
                        <a style={{textAlign: "center"}} className="color-blue"
 													onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}