he2802 2 years ago
parent
commit
04a6235477

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -1019,7 +1019,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
     private String dealTxt(String txt) {
         if(Validator.isEmpty(txt)){
-            return null;
+            return "";
         }
         txt = txt.trim();
         if (txt.startsWith("\\t")) {

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -879,7 +879,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                     item.setModuleName(cVo.getModuleName());
                     item.setChapterName(cVo.getChapterName());
                     item.setSectionName(cVo.getSectionName());
-                    item.setDurationTime(Validator.isEmpty(cVo.getDurationTime())?0:((float)(cVo.getDurationTime()/3600)));
+                    item.setDurationTime(Validator.isEmpty(cVo.getDurationTime())?new BigDecimal(0):((new BigDecimal(cVo.getDurationTime()).divide(new BigDecimal(3600)))));
                     item.setStudyTimeTxt(cVo.getStudyTimeTxt());
                     item.setStudyTimeLongTxt(cVo.getStudyTimeLongTxt());
                     item.setStudyStatusTxt(cVo.getStudyStatusTxt());

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodStudentExportAllVo.java

@@ -75,7 +75,7 @@ public class ClassPeriodStudentExportAllVo {
 	private String sectionName;
 	@Excel(name = "节时长(小时)")
 	@ApiModelProperty("节时长(小时)")
-	private Float durationTime;
+	private BigDecimal durationTime;
 	@Excel(name = "学习/做题时间")
 	@ApiModelProperty("学习/做题时间")
 	private String studyTimeTxt;