王子文 压力容器/压力管道年检报告页面添加年检报告编号

master/src/main/java/com/ruoyi/project/sems/controller/TReportYlgdController.java

@@ -73,8 +73,8 @@ public class TReportYlgdController extends BaseController {
         //创建sheet页
         Sheet sheet = wb.createSheet("sheet1");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
-        for (int i = 0; i < 41; i++) {
-            if (i == 0 || i == 1 || i == 2 || i == 20 || i == 21 || i ==22 || i == 23 || i == 24 || i == 25) {
+        for (int i = 0; i < 27; i++) {
+            if (i == 0 || i == 1 || i == 2 || i == 20 || i == 21 || i ==22 || i == 23 || i == 24 || i == 25 || i == 26) {
                 sheet.setColumnWidth(i, 20 * 256);
             } else {
                 sheet.setColumnWidth(i,  10 * 256);
@@ -127,7 +127,8 @@ public class TReportYlgdController extends BaseController {
         row0.createCell(22).setCellValue("下次年度检查日期");
         row0.createCell(23).setCellValue("问题及处理");
         row0.createCell(24).setCellValue("检查结论");
-        row0.createCell(25).setCellValue("检查结论备注");
+        row0.createCell(25).setCellValue("年检报告编号");
+        row0.createCell(26).setCellValue("检查结论备注");
         Row row1 = sheet.createRow(1);
         row1.createCell(0);
         row1.createCell(1);
@@ -155,20 +156,21 @@ public class TReportYlgdController extends BaseController {
         row1.createCell(23);
         row1.createCell(24);
         row1.createCell(25);
+        row1.createCell(26);
         Row row2 = sheet.createRow(2);
-        for (int i = 0; i < 26; i++) {
+        for (int i = 0; i < 27; i++) {
             row2.createCell(i);
-            if (i == 25) row2.createCell(i).setCellValue("1：符合要求");
+            if (i == 26) row2.createCell(i).setCellValue("1：符合要求");
         }
         Row row3 = sheet.createRow(3);
-        for (int i = 0; i < 26; i++) {
+        for (int i = 0; i < 27; i++) {
             row3.createCell(i);
-            if (i == 25) row3.createCell(i).setCellValue("2：基本符合要求");
+            if (i == 26) row3.createCell(i).setCellValue("2：基本符合要求");
         }
         Row row4 = sheet.createRow(4);
-        for (int i = 0; i < 26; i++) {
+        for (int i = 0; i < 27; i++) {
             row4.createCell(i);
-            if (i == 25) row4.createCell(i).setCellValue("3：不符合要求");
+            if (i == 26) row4.createCell(i).setCellValue("3：不符合要求");
         }
         // 合并单元格
         sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
@@ -192,8 +194,9 @@ public class TReportYlgdController extends BaseController {
         sheet.addMergedRegion(new CellRangeAddress(0,1,23,23));
         sheet.addMergedRegion(new CellRangeAddress(0,1,24,24));
         sheet.addMergedRegion(new CellRangeAddress(0,1,25,25));
+        sheet.addMergedRegion(new CellRangeAddress(0,1,26,26));
         // 表头样式
-        for (int i = 0; i < 25; i++) {
+        for (int i = 0; i < 26; i++) {
             if (i < 3) {
                 row0.getCell(i).setCellStyle(styleGrey);
                 row1.getCell(i).setCellStyle(styleGrey);
@@ -236,6 +239,7 @@ public class TReportYlgdController extends BaseController {
                 }
                 sheet.getRow(rowIndex).getCell(23).setCellValue(t.getProblem());
                 sheet.getRow(rowIndex).getCell(24).setCellValue(t.getCon());
+                sheet.getRow(rowIndex).getCell(25).setCellValue(t.getYearReportNo());
             } else {
                 Row row = sheet.createRow(rowIndex);
                 row.createCell(0).setCellValue(t.getUseno());
@@ -267,6 +271,7 @@ public class TReportYlgdController extends BaseController {
                 }
                 row.createCell(23).setCellValue(t.getProblem());
                 row.createCell(24).setCellValue(t.getCon());
+                row.createCell(25).setCellValue(t.getYearReportNo());
             }
             rowIndex++;
         }
@@ -488,6 +493,9 @@ public class TReportYlgdController extends BaseController {
                     } else if (j == 24) {
                         //检查结论
                         entity.setCon(cellValue);
+                    } else if (j == 25) {
+                        //年检报告编号
+                        entity.setYearReportNo(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId);

master/src/main/java/com/ruoyi/project/sems/controller/TReportYlrqController.java

@@ -73,8 +73,8 @@ public class TReportYlrqController extends BaseController {
         //创建sheet页
         Sheet sheet = wb.createSheet("sheet1");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
-        for (int i = 0; i < 41; i++) {
-            if (i == 0 || i == 1 || i == 2 || i == 35 || i == 36 || i ==37 || i == 38 || i == 39 || i == 40) {
+        for (int i = 0; i < 42; i++) {
+            if (i == 0 || i == 1 || i == 2 || i == 35 || i == 36 || i ==37 || i == 38 || i == 39 || i == 40 || i == 41) {
                 sheet.setColumnWidth(i, 20 * 256);
             } else {
                 sheet.setColumnWidth(i,  10 * 256);
@@ -142,7 +142,8 @@ public class TReportYlrqController extends BaseController {
         row0.createCell(37).setCellValue("下次年度检查日期");
         row0.createCell(38).setCellValue("问题及处理");
         row0.createCell(39).setCellValue("检查结论");
-        row0.createCell(40).setCellValue("检查结论备注");
+        row0.createCell(40).setCellValue("年检报告编号");
+        row0.createCell(41).setCellValue("检查结论备注");
         Row row1 = sheet.createRow(1);
         row1.createCell(0);
         row1.createCell(1);
@@ -185,20 +186,21 @@ public class TReportYlrqController extends BaseController {
         row1.createCell(38);
         row1.createCell(39);
         row1.createCell(40);
+        row1.createCell(41);
         Row row2 = sheet.createRow(2);
-        for (int i = 0; i < 41; i++) {
+        for (int i = 0; i < 42; i++) {
             row2.createCell(i);
-            if (i == 40) row2.createCell(i).setCellValue("1：符合要求");
+            if (i == 41) row2.createCell(i).setCellValue("1：符合要求");
         }
         Row row3 = sheet.createRow(3);
-        for (int i = 0; i < 41; i++) {
+        for (int i = 0; i < 42; i++) {
             row3.createCell(i);
-            if (i == 40) row3.createCell(i).setCellValue("2：基本符合要求");
+            if (i == 41) row3.createCell(i).setCellValue("2：基本符合要求");
         }
         Row row4 = sheet.createRow(4);
-        for (int i = 0; i < 41; i++) {
+        for (int i = 0; i < 42; i++) {
             row4.createCell(i);
-            if (i == 40) row4.createCell(i).setCellValue("3：不符合要求");
+            if (i == 41) row4.createCell(i).setCellValue("3：不符合要求");
         }
         // 合并单元格
         sheet.addMergedRegion(new CellRangeAddress(0,1,0,0));
@@ -213,8 +215,9 @@ public class TReportYlrqController extends BaseController {
         sheet.addMergedRegion(new CellRangeAddress(0,1,38,38));
         sheet.addMergedRegion(new CellRangeAddress(0,1,39,39));
         sheet.addMergedRegion(new CellRangeAddress(0,1,40,40));
+        sheet.addMergedRegion(new CellRangeAddress(0,1,41,41));
         // 表头样式
-        for (int i = 0; i < 40; i++) {
+        for (int i = 0; i < 41; i++) {
             if (i < 3) {
                 row0.getCell(i).setCellStyle(styleGrey);
                 row1.getCell(i).setCellStyle(styleGrey);
@@ -272,6 +275,7 @@ public class TReportYlrqController extends BaseController {
                 }
                 sheet.getRow(rowIndex).getCell(38).setCellValue(t.getProblem());
                 sheet.getRow(rowIndex).getCell(39).setCellValue(t.getCon());
+                sheet.getRow(rowIndex).getCell(40).setCellValue(t.getYearReportNo());
             } else {
                 Row row = sheet.createRow(rowIndex);
                 row.createCell(0).setCellValue(t.getUseno());
@@ -318,6 +322,7 @@ public class TReportYlrqController extends BaseController {
                 }
                 row.createCell(38).setCellValue(t.getProblem());
                 row.createCell(39).setCellValue(t.getCon());
+                row.createCell(40).setCellValue(t.getYearReportNo());
             }
             rowIndex++;
         }
@@ -545,6 +550,9 @@ public class TReportYlrqController extends BaseController {
                     } else if (j == 39) {
                         //检查结论
                         entity.setCon(cellValue);
+                    } else if (j == 40) {
+                        //年检报告编号
+                        entity.setYearReportNo(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId);