Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/application_controller.rb

@@ -308,7 +308,7 @@ class ApplicationController < ActionController::Base
 		end
 
 		if !User.current.logged? && Rails.env.development?
-			User.current = User.find 8686
+			User.current = User.find 1
 		end
 
 

app/controllers/examination_intelligent_settings_controller.rb

@@ -36,7 +36,7 @@ class ExaminationIntelligentSettingsController < ApplicationController
   end
 
   def exchange_one_item
-    item = @exam.item_baskets.find_by!(id: params[:item_id])
+    item = @exam.item_baskets.find_by!(item_bank_id: params[:item_id])
     exam_type_setting = @exam.examination_type_settings.find_by!(item_type: item.item_type)
 
     # 获取可选的题

app/helpers/homework_commons_helper.rb

@@ -177,6 +177,17 @@ module HomeworkCommonsHelper
     type == 2 ? student_works.size : (type == 1 ? student_works.where("work_status != 0").size : student_works.where(work_status: 0).size)
   end
 
+  # 作品数统计
+  def calculate_work_count homework_common, member
+    count = {}
+    student_works = homework_common.teacher_works(member)
+    count[:commit_count] = student_works.select{|work| work.work_status != 0 }.size
+    count[:uncommit_count] = student_works.select{|work| work.work_status == 0 }.size
+    count[:compelete_count] = Myshixun.where(id: student_works.pluck(:myshixun_id).reject(&:blank?), status: 1).size
+    count[:all_count] = student_works.size
+    count
+  end
+
   # 上次查重的时间
   def last_review_time homework_common, course_group
     review = homework_common.homework_group_reviews.where(:course_group_id => course_group.id).last

app/views/homework_commons/index.json.jbuilder

@@ -25,9 +25,11 @@ json.homeworks @homework_commons.each do |homework|
   json.upper_category_name homework.course_second_category&.name unless params[:category]
 
   unless curr_status[:status].include?("未发布")
-    json.commit_count studentwork_count homework, 1, @member
+    work_count = calculate_work_count homework, @member
-    json.uncommit_count studentwork_count homework, 0, @member
+    json.commit_count work_count[:commit_count]
-    json.all_count studentwork_count homework, 2, @member
+    json.uncommit_count work_count[:uncommit_count]
+    json.all_count work_count[:all_count]
+    json.compelete_count work_count[:compelete_count]
   end
 
   if homework.homework_type == "practice"

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

@@ -277,7 +277,7 @@ class ShixunhomeWorkItem extends Component{
           /*list style*/
           .boardsList {
             display: flex;
-            align-items: center;
+            align-items: flex-start;
 
             padding-top: 8px;
             padding-bottom: 10px;
@@ -297,12 +297,12 @@ class ShixunhomeWorkItem extends Component{
           `}</style>
 
           {this.props.isAdmin?
-            <span className={`shixunitem${index} fl`} style={{"height":"55px"}}>{checkBox}</span>
+            <span className={`shixunitem${index} fl`} style={{"height":"55px",paddingTop:"2px"}}>{checkBox}</span>
             :
             ""
           }
 
-          <div className="clearfix ds pr pt5 contentSection" >
+          <div className="clearfix ds pr contentSection" >
 						<style>{`
             .maxwidth333{
                 max-width: 333px;
@@ -404,14 +404,21 @@ class ShixunhomeWorkItem extends Component{
 
 
             </h6>
-
+            {/* style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5||discussMessage.time_status===6?{"maxWidth":"216px"}:{"maxWidth":"550px"}} */}
+            {
+              discussMessage && discussMessage.upper_category_name &&
+              // <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
+                <div className="color-grey9 task-hide mt5" title={discussMessage.upper_category_name}>所属目录：{discussMessage.upper_category_name}</div>
+              // </ConditionToolTip>
+            }
             <div className="cl"></div>
-            <p className="color-grey mt16 fl" style={{"width":"820px"}}>
+            <p className="color-grey mt15 fl" style={{"width":"820px"}}>
               <span >
                 {/* <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a> */}
                 { discussMessage.author && <span className="mr15 color-grey-3">{discussMessage.author}</span> }
 								{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">已开始做题 {discussMessage.commit_count}人</span>}
-								{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题 {discussMessage.uncommit_count}人</span>}
+                {discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题 {discussMessage.uncommit_count}人</span>}
+                {discussMessage.compelete_count===undefined?"":<span className="mr15 color-grey9">已完成做题 {discussMessage.compelete_count}人</span>}
                 {/*<span className="mr15 color-grey9">{discussMessage.replies_count} 3 未评</span>*/}
 
                 {
@@ -426,12 +433,7 @@ class ShixunhomeWorkItem extends Component{
                   :
                    <span className="mr15 color-grey9">{discussMessage.status_time}</span>
                 }
-                {
+                
-                  discussMessage && discussMessage.upper_category_name &&
-                  <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
-                    { <div className=" color-grey9 task-hide fr" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4||discussMessage.time_status===5||discussMessage.time_status===6?{"maxWidth":"216px"}:{"maxWidth":"550px"}} title={discussMessage.upper_category_name}>所属目录：{discussMessage.upper_category_name}</div>}
-                  </ConditionToolTip>
-                }