PSSR气密导出功能修改

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -454,26 +454,27 @@ public class TPssrAirtightController extends BaseController {
                 row.createCell(4).setCellValue(t.getAirtightPressure());
                 row.createCell(5).setCellValue(t.getInitialPressure());
                 row.createCell(6).setCellValue(t.getFinalPressure());
-                row.createCell(7).setCellValue(t.getStandard());
-                row.createCell(8).setCellValue(t.getUptoStandard());
-                row.createCell(9);
+                row.createCell(7).setCellValue(t.getLeakageRate() + "%");
+                row.createCell(8).setCellValue(t.getStandard());
+                row.createCell(9).setCellValue(t.getUptoStandard());
                 row.createCell(10);
+                row.createCell(11);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirm1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirm2()));
                     String confirm1 = sysUser.getSignUrl();
                     String confirm2 = sysUser2.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 9, 1, 1);
-                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 10, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 10, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 11, 1, 1);
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
                 }
-                row.createCell(11).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
-                row.createCell(12).setCellValue(t.getRemarks());
+                row.createCell(12).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                row.createCell(13).setCellValue(t.getRemarks());
 
 
                 //渲染样式
-                for (int i = 0; i < 13; i++) {
+                for (int i = 0; i < 14; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;