LY 特种设备 优化

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

@@ -443,6 +443,8 @@ public class TSpecdevCcController extends BaseController {
                         entity.setReportNo(cellValue);
                     } else if (j == 7) {
                         entity.setPerTestConclusion(cellValue);
+                    }else if (j == 8) {
+                        entity.setRemarks(cellValue);
                     }
                 }
                 logger.info("entity:" + entity);
@@ -561,6 +563,8 @@ public class TSpecdevCcController extends BaseController {
         row0.getCell(6).setCellStyle(style);
         row0.createCell(7).setCellValue("定期检验结论");
         row0.getCell(7).setCellStyle(style);
+        row0.createCell(8).setCellValue("备注");
+        row0.getCell(8).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -579,6 +583,7 @@ public class TSpecdevCcController extends BaseController {
             }
             row.createCell(6).setCellValue(t.getReportNo());
             row.createCell(7).setCellValue(t.getPerTestConclusion());
+            row.createCell(8).setCellValue(t.getRemarks());
             rowIndex++;
         }
 

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

@@ -432,6 +432,8 @@ public class TSpecdevDtController extends BaseController {
                         }
                     } else if (j == 9) {    //定期结论
                         entity.setPerTestConclusion(cellValue);
+                    }else if (j == 10) {    //定期结论
+                        entity.setRemarks(cellValue);
                     }
                 }
                 logger.info("entity:" + JSON.toJSONString(entity));
@@ -553,6 +555,8 @@ public class TSpecdevDtController extends BaseController {
         row0.getCell(8).setCellStyle(style);
         row0.createCell(9).setCellValue("定期检验结论");
         row0.getCell(9).setCellStyle(style);
+        row0.createCell(10).setCellValue("备注");
+        row0.getCell(10).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -573,6 +577,7 @@ public class TSpecdevDtController extends BaseController {
                 row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());
+            row.createCell(10).setCellValue(t.getRemarks());
             rowIndex++;
         }
 

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

@@ -443,6 +443,8 @@ public class TSpecdevDzsbController extends BaseController {
                     }
                 } else if (j == 9) {    //
                     entity.setPerTestConclusion(cellValue);
+                }else if (j == 10) {    //
+                    entity.setRemarks(cellValue);
                 }
             }
             logger.info("entity:" + JSON.toJSONString(entity));
@@ -563,6 +565,8 @@ public class TSpecdevDzsbController extends BaseController {
         row0.getCell(8).setCellStyle(style);
         row0.createCell(9).setCellValue("定期检验结论");
         row0.getCell(9).setCellStyle(style);
+        row0.createCell(10).setCellValue("备注");
+        row0.getCell(10).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -583,6 +587,7 @@ public class TSpecdevDzsbController extends BaseController {
                 row.createCell(8).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());
+            row.createCell(10).setCellValue(t.getRemarks());
             rowIndex++;
         }
         OutputStream out = null;

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

@@ -484,6 +484,8 @@ public class TSpecdevGlController extends BaseController
                         if (cellValue.length() > 3) {//下次外部检验日期
                             entity.setOutNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
+                    }else if (j == 14) {
+                        entity.setRemarks(cellValue);//beizhu
                     }
                 }
                 logger.info("entity:" + JSON.toJSONString(entity));
@@ -614,7 +616,7 @@ public class TSpecdevGlController extends BaseController
         row0.createCell(11).setCellValue("外部检验结论");row0.getCell(11).setCellStyle(style);
         row0.createCell(12).setCellValue("外部检验报告编号");row0.getCell(12).setCellStyle(style);
         row0.createCell(13).setCellValue("下次外部检验日期");row0.getCell(13).setCellStyle(style);
-
+        row0.createCell(14).setCellValue("备注");row0.getCell(14).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -644,6 +646,7 @@ public class TSpecdevGlController extends BaseController
             if (t.getOutNextWarnDate()!= null){
                 row.createCell(13).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getOutNextWarnDate()));
             }
+            row.createCell(14).setCellValue(t.getRemarks());
             rowIndex++;
         }
         OutputStream out = null;

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

@@ -521,6 +521,8 @@ public class TSpecdevYlgdController extends BaseController {
                         }
                     } else if (j == 13) {   //年度检查报告编号
                         entity.setYearReportNo(cellValue);
+                    }else if (j == 14) {   //备注
+                        entity.setRemarks(cellValue);
                     }
                 }
                 logger.info("entity:" + JSON.toJSONString(entity));
@@ -681,7 +683,8 @@ public class TSpecdevYlgdController extends BaseController {
         row0.getCell(12).setCellStyle(style);
         row0.createCell(13).setCellValue("年度检查报告编号");
         row0.getCell(13).setCellStyle(style);
-
+        row0.createCell(14).setCellValue("备注");
+        row0.getCell(14).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -710,6 +713,7 @@ public class TSpecdevYlgdController extends BaseController {
                 row.createCell(12).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getYearNextWarnDate()));
             }
             row.createCell(13).setCellValue(t.getYearReportNo());
+            row.createCell(14).setCellValue(t.getRemarks());
             rowIndex++;
         }
         OutputStream out = null;

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

@@ -533,6 +533,8 @@ public class TSpecdevYlrqController extends BaseController {
                         }
                     } else if (j == 13) {//年度检查编号
                         entity.setYearReportNo(cellValue);
+                    }else if (j == 14) {//备注
+                        entity.setRemarks(cellValue);
                     }
                 }
                 logger.info("entity:" + entity);
@@ -691,6 +693,8 @@ public class TSpecdevYlrqController extends BaseController {
         row0.getCell(12).setCellStyle(style);
         row0.createCell(13).setCellValue("年度检查报告编号");
         row0.getCell(13).setCellStyle(style);
+        row0.createCell(14).setCellValue("备注");
+        row0.getCell(14).setCellStyle(style);
 
         //填充数据
         int rowIndex = 1;
@@ -720,6 +724,7 @@ public class TSpecdevYlrqController extends BaseController {
                 row.createCell(12).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getYearNextWarnDate()));
             }
             row.createCell(13).setCellValue(t.getYearReportNo());
+            row.createCell(14).setCellValue(t.getRemarks());
             rowIndex++;
         }
         OutputStream out = null;