Merge remote-tracking branch 'origin/meiteng' into zql

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -373,21 +373,24 @@ public class BChapterServiceImpl implements BChapterService {
                     // 更新 学生针对此章节的中间表
                     List<BRStudentChapter> brStudentChapterList = brStudentChapterRepository.queryByStuIdAndChapter(chapterDTO.getBusinessId(), "");
                     for (BRStudentChapter studentChapter: brStudentChapterList){
-                        double learnProgress = Double.parseDouble(lessonPerson.getLearnProgress().split("%")[0]) / 100 ;
-                        double newLearnProgress = Double.parseDouble(numberFormat.format((float) (learnProgress * Integer.parseInt(bLesson.getClassHour()) - studentChapter.getProgress()) / Float.parseFloat(bLesson.getClassHour())));
-                        if (newLearnProgress == 0){
-                            lessonPerson.setIsFinish("0");
-                            lessonPerson.setFinishDate(null);
+                        if (lessonPerson.getPersonId().equals(studentChapter.getStudentId())) {
+
+                            double learnProgress = Double.parseDouble(lessonPerson.getLearnProgress().split("%")[0]) / 100;
+                            double newLearnProgress = Double.parseDouble(numberFormat.format((float) (learnProgress * Integer.parseInt(bLesson.getClassHour()) - studentChapter.getProgress()) / Float.parseFloat(bLesson.getClassHour())));
+                            if (newLearnProgress == 0) {
+                                lessonPerson.setIsFinish("0");
+                                lessonPerson.setFinishDate(null);
+                            }
+                            if (0 < newLearnProgress && newLearnProgress < 1) {
+                                lessonPerson.setIsFinish("1");
+                                lessonPerson.setFinishDate(null);
+                            }
+                            lessonPerson.setLearnProgress(newLearnProgress * 100 + "%");
+                            bLessonPersonRepository.updateByPrimaryKeySelective(lessonPerson);
+                            studentChapter.setProgress(0);
+                            studentChapter.setCurrentLocation(0);
+                            brStudentChapterRepository.updateById(studentChapter);
                         }
-                        if (0 < newLearnProgress && newLearnProgress < 1){
-                            lessonPerson.setIsFinish("1");
-                            lessonPerson.setFinishDate(null);
-                        }
-                        lessonPerson.setLearnProgress(newLearnProgress*100 + "%");
-                        bLessonPersonRepository.updateByPrimaryKeySelective(lessonPerson);
-                        studentChapter.setProgress(0);
-                        studentChapter.setCurrentLocation(0);
-                        brStudentChapterRepository.updateById(studentChapter);
                     }
                 }
             }