Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/service/impl/PdfTemplateManagementServiceImpl.java

@@ -140,8 +140,7 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
         document.writeBottomCell("共 10 页", Element.ALIGN_RIGHT, 1, 1, signTable).setRightIndent(30f);
         document.writeBottomCell("第 10 页", Element.ALIGN_RIGHT, 1, 1, signTable);
         document.addContent(signTable);
-        document.setParagraph("7.附录", 10.5f, Element.ALIGN_LEFT, 45,1f, 0f);
-        document.setParagraph("图 1 样品照片", 10.5f, Element.ALIGN_CENTER, 0,20f, 0f);
+        document.setParagraph("7.附录", 10.5f, Element.ALIGN_LEFT, 45,1f, 10f);
         // 添加内容到新页面
         PdfPTable pictureTable = new PdfPTable(new float[]{25, 25, 25, 25});
         pictureTable.setWidthPercentage(90);
@@ -168,6 +167,7 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
             pictureTable.addCell(cell);
         }
         document.addContent(pictureTable);
+        document.setParagraph("图 1 样品照片", 10.5f, Element.ALIGN_CENTER, 0,20f, 0f);
         document.setParagraph("图 2 试验照片", 10.5f, Element.ALIGN_CENTER, 0,20f, 0f);
         // 关闭PDF
         document.close();
@@ -348,13 +348,13 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
         }
         // 图片域
         // 样品
-        String url = inspectionReportPdfVO.getBrandImage();
-        if (StrUtil.isNotBlank(url)) {
-            if (url.startsWith(",")) {
-                url = inspectionReportPdfVO.getBrandImage().substring(1);
-            }
-            addImageToPdf("brand", fields, ps, "http://49.232.167.247:22038" + url.split(",")[0]);
-        }
+//        String url = inspectionReportPdfVO.getBrandImage();
+//        if (StrUtil.isNotBlank(url)) {
+//            if (url.startsWith(",")) {
+//                url = inspectionReportPdfVO.getBrandImage().substring(1);
+//            }
+//            addImageToPdf("brand", fields, ps, "http://49.232.167.247:22038" + url.split(",")[0]);
+//        }
     }
 
 

quality-review/src/main/java/com/ruoyi/service/impl/StatisticsHomeServiceImpl.java

@@ -50,15 +50,15 @@ public class StatisticsHomeServiceImpl implements StatisticsHomeService {
        InspectionItemPassedNumVO inspectionItemPassedNumVO =  statisticsHomeMapper.selectInspectionItemPassedNum();
        List<AverageInspectionRateVO> list = new ArrayList<>();
        AverageInspectionRateVO averageInspectionRateOne = new AverageInspectionRateVO();
-       averageInspectionRateOne.setInspectionItems("汽车信息安全管理体系要求");
+       averageInspectionRateOne.setInspectionItems("信息安全管理体系要求");
        averageInspectionRateOne.setPassingRate(proportionCalculation(inspectionItemPassedNumVO.getSysReviewPassedNum(), inspectionItemPassedNumVO.getSysReviewcompletedNum()));
         list.add(averageInspectionRateOne);
        AverageInspectionRateVO averageInspectionRateTwo = new AverageInspectionRateVO();
-       averageInspectionRateTwo.setInspectionItems("汽车信息安全一般要求");
+       averageInspectionRateTwo.setInspectionItems("信息安全一般要求");
        averageInspectionRateTwo.setPassingRate(proportionCalculation(inspectionItemPassedNumVO.getCarReviewPassedNum(),inspectionItemPassedNumVO.getCarReviewcompletedNum()));
         list.add(averageInspectionRateTwo);
        AverageInspectionRateVO averageInspectionRateThree = new AverageInspectionRateVO();
-       averageInspectionRateThree.setInspectionItems("汽车信息安全技术要求");
+       averageInspectionRateThree.setInspectionItems("信息安全技术要求");
        averageInspectionRateThree.setPassingRate(proportionCalculation(inspectionItemPassedNumVO.getModelTestPassedNum(),inspectionItemPassedNumVO.getModelTestCompletedNum()));
         list.add(averageInspectionRateThree);
         for(AverageInspectionRateVO averageInspectionRate:list){