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

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

@@ -327,6 +327,9 @@ public class BChapterServiceImpl implements BChapterService {
                         if (learnProgress > 0 && newLearnProgress < 0.01){
                             newLearnProgress = 0.01f;
                         }
+                        if ("2".equals(lessonPerson.getIsFinish()) && newLearnProgress < 1){
+                            lessonPerson.setIsFinish("1");
+                        }
                         lessonPerson.setLearnProgress(newLearnProgress*100 + "%");
                         bLessonPersonRepository.updateByPrimaryKeySelective(lessonPerson);
                         studentChapter.setProgress(0);