PSSR支（吊）架字段拆分导出修改

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

@@ -99,10 +99,10 @@ public class TPssrFrameController extends BaseController
             XSSFSheet sheet = wb.getSheetAt(0);
 
             //填充数据
-            int rowIndex = 3;
+            int rowIndex = 4;
             int num = 1;
 
-            Row originalRow = sheet.getRow(3);
+            Row originalRow = sheet.getRow(4);
             Cell originalcell = originalRow.getCell(0);
             // 获取单元格样式
             CellStyle originalStyle = originalcell.getCellStyle();
@@ -116,25 +116,41 @@ public class TPssrFrameController extends BaseController
                 row.createCell(3).setCellValue(t.getPipelineNumber());
                 row.createCell(4).setCellValue(t.getDevNo());
                 row.createCell(5).setCellValue(t.getSupportType());
-                row.createCell(6).setCellValue(t.getProcessingResult());
-                row.createCell(7);
-                row.createCell(8);
+
+                row.createCell(6).setCellValue(t.getSupportType());
+                row.createCell(7).setCellValue(t.getSupportType());
+                row.createCell(8).setCellValue(t.getSupportType());
+                row.createCell(9).setCellValue(t.getSupportType());
+                row.createCell(10).setCellValue(t.getSupportType());
+                row.createCell(11).setCellValue(t.getSupportType());
+                row.createCell(12).setCellValue(t.getSupportType());
+                row.createCell(13).setCellValue(t.getSupportType());
+                row.createCell(14).setCellValue(t.getSupportType());
+                row.createCell(15).setCellValue(t.getSupportType());
+                row.createCell(16).setCellValue(t.getSupportType());
+                row.createCell(17).setCellValue(t.getSupportType());
+                row.createCell(18).setCellValue(t.getSupportType());
+                row.createCell(19).setCellValue(t.getSupportType());
+
+                row.createCell(20).setCellValue(t.getProcessingResult());
+                row.createCell(21);
+                row.createCell(22);
                 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(), 7, 1, 1);
-                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 21, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 22, 1, 1);
                 } catch (NumberFormatException e) {
                     throw new RuntimeException(e);
                 }
-                row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
-                row.createCell(10).setCellValue(t.getRemarks());
+                row.createCell(23).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                row.createCell(24).setCellValue(t.getRemarks());
 
 
                 //渲染样式
-                for (int i = 0; i < 11; i++) {
+                for (int i = 0; i < 25; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;