修改bug

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

@@ -323,12 +323,13 @@ 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 = Math.floor((learnProgress * Integer.parseInt(bLesson.getClassHour()) - studentChapter.getProgress()) / Integer.parseInt(bLesson.getClassHour()));
+                        double newLearnProgress = (learnProgress * Integer.parseInt(bLesson.getClassHour()) - studentChapter.getProgress()) / Double.parseDouble(bLesson.getClassHour());
                         if (learnProgress > 0 && newLearnProgress < 0.01){
-                            newLearnProgress = 0.01f;
+                            newLearnProgress = 0.01;
                         }
                         if ("2".equals(lessonPerson.getIsFinish()) && newLearnProgress < 1){
                             lessonPerson.setIsFinish("1");
+                            lessonPerson.setFinishDate(null);
                         }
                         lessonPerson.setLearnProgress(newLearnProgress*100 + "%");
                         bLessonPersonRepository.updateByPrimaryKeySelective(lessonPerson);
@@ -372,19 +373,20 @@ public class BChapterServiceImpl implements BChapterService {
         List<BLessonPerson> bLessonPersonList = bLessonPersonRepository.selectByLessonId(lessonId);
         BLesson bLesson = bLessonRepository.selectByPrimaryKey(lessonId);
         for (BLessonPerson lessonPerson: bLessonPersonList){
-            float newLearnProgress ;
-            float learnProgress = Float.parseFloat(lessonPerson.getLearnProgress().split("%")[0]) / 100 ;
+            double newLearnProgress ;
+            double learnProgress = Double.parseDouble(lessonPerson.getLearnProgress().split("%")[0]) / 100 ;
             if (add){
-                newLearnProgress = (float) Math.floor(learnProgress * Integer.parseInt(bLesson.getClassHour()) / (Integer.parseInt(bLesson.getClassHour()) + 1));
+                newLearnProgress = (float) Math.floor(learnProgress * Integer.parseInt(bLesson.getClassHour()) / (Double.parseDouble(bLesson.getClassHour()) + 1));
             }else {
-                newLearnProgress = Integer.parseInt(bLesson.getClassHour()) == 0 ? 0 : (float) Math.floor(learnProgress * Integer.parseInt(bLesson.getClassHour() + 1) / (Integer.parseInt(bLesson.getClassHour())));
+                newLearnProgress = Integer.parseInt(bLesson.getClassHour()) == 0 ? 0 : (float) Math.floor(learnProgress * Integer.parseInt(bLesson.getClassHour() + 1) / Double.parseDouble(bLesson.getClassHour()));
             }
             if (learnProgress > 0 && newLearnProgress < 0.01){
-                newLearnProgress = 0.01f;
+                newLearnProgress = 0.01;
             }
 
             if ("2".equals(lessonPerson.getIsFinish()) && newLearnProgress < 1){
                 lessonPerson.setIsFinish("1");
+                lessonPerson.setFinishDate(null);
             }
             if (newLearnProgress >= 1){
                 newLearnProgress = 1;

src/main/java/org/rcisoft/common/util/feignDto/GetAllRspDTO.java

@@ -42,4 +42,4 @@ public class GetAllRspDTO {
 
     @ApiModelProperty(value = "入职时间", position = 4)
     private Date createAt;
-}
+}
\ No newline at end of file