添加里程

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/ReportServiceImpl.java

@@ -469,23 +469,23 @@ public class ReportServiceImpl extends BaseServiceImpl<ReportMapper, Report> imp
                             str = " 问题图片";
                             cell.add(new Paragraph(str, font));
                         } else{
-                            Image image = null;
-                            //String url = CommonConfig.imageURL + reportInfoVO.getQuestionReportList().get(i).getFileMarkerUrl();
-                            String url = reportInfoVO.getQuestionReportList().get(i).getFileMarkerUrl();
-                            if (new UrlResource(url).exists()) {
-                                image = Image.getInstance(url);
-                                image.setAlignment(Image.ALIGN_CENTER);
-                                image.scalePercent(100); //依照比例缩放
-                                image.setAbsolutePosition(400, 600);
-                                image.scaleToFit(300, 300);//自定义大
-                            } else {
-                                log.error("图片不存在！" + url);
-                            }
-                            if (new UrlResource(url).exists()) {
-                                cell.add(image);
-                            } else {
-                                cell.add(new Paragraph(""));
-                            }
+//                            Image image = null;
+//                            //String url = CommonConfig.imageURL + reportInfoVO.getQuestionReportList().get(i).getFileMarkerUrl();
+//                            String url = reportInfoVO.getQuestionReportList().get(i).getFileMarkerUrl();
+//                            if (new UrlResource(url).exists()) {
+//                                image = Image.getInstance(url);
+//                                image.setAlignment(Image.ALIGN_CENTER);
+//                                image.scalePercent(100); //依照比例缩放
+//                                image.setAbsolutePosition(400, 600);
+//                                image.scaleToFit(300, 300);//自定义大
+//                            } else {
+//                                log.error("图片不存在！" + url);
+//                            }
+//                            if (new UrlResource(url).exists()) {
+//                                cell.add(image);
+//                            } else {
+//                                cell.add(new Paragraph(""));
+//                            }
                         }
                         table4.addCell(cell);
 

tuoheng-admin/src/main/java/com/tuoheng/admin/utils/TimeUtil.java

@@ -18,11 +18,11 @@ public class TimeUtil {
                 - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(milliseconds));
         System.out.println("milliseconds :-" + milliseconds);
 
-        if(day!=0L && hours!=0L && minutes!=0L && seconds!=0L){
+        if(day!=0L){
             return String.format("%d 天 %d 时 %d 分 %d 秒", day, hours, minutes, seconds);
-        }else if( day==0L && hours!=0L && minutes!=0L && seconds!=0L){
+        }else if(hours!=0L){
             return String.format("%d 时 %d 分 %d 秒", hours, minutes, seconds);
-        }else if(day==0L && hours==0L &&  minutes!=0L ){
+        }else if(minutes!=0L ){
             return String.format("%d 分 %d 秒", minutes, seconds);
         }else{
             return String.format("%d 秒",seconds);