bug fix

master/src/main/java/com/ruoyi/framework/task/AlarmDayCatchTask.java

@@ -63,7 +63,7 @@ public class AlarmDayCatchTask extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAlarmstatisticsDay entity = new TAlarmstatisticsDay();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/affair/controller/TIntercomController.java

@@ -143,7 +143,7 @@ public class TIntercomController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TIntercom entity = new TIntercom();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/affair/controller/TOfficesupplyController.java

@@ -143,7 +143,7 @@ public class TOfficesupplyController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TOfficesupply entity = new TOfficesupply();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/affair/controller/TPpeController.java

@@ -143,7 +143,7 @@ public class TPpeController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPpe entity = new TPpe();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/apply/controller/TApplyLockController.java

@@ -244,7 +244,7 @@ public class TApplyLockController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TApplyLock entity = new TApplyLock();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/cui/controller/TPipeController.java

@@ -167,7 +167,7 @@ public class TPipeController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPipe entity = new TPipe();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/cui/controller/TProblemsController.java

@@ -174,7 +174,7 @@ public class TProblemsController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TProblems entity = new TProblems();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/cui/controller/TPvesselController.java

@@ -165,7 +165,7 @@ public class TPvesselController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPvessel entity = new TPvessel();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/document/controller/TPlantproglistController.java

@@ -187,7 +187,7 @@ public class TPlantproglistController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPlantproglist entity = new TPlantproglist();
                 //判断文件类型，如果是附件清单，读取逻辑不同
                 int n = 0;

master/src/main/java/com/ruoyi/project/document/controller/TPublicdocController.java

@@ -153,7 +153,7 @@ public class TPublicdocController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPublicdoc entity = new TPublicdoc();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/document/controller/TPublicdocmenuController.java

@@ -165,7 +165,7 @@ public class TPublicdocmenuController extends BaseController
       try {
         logger.info("读取行数：" + i);
         Row row = sheet.getRow(i);
-        int cellNum = row.getPhysicalNumberOfCells();
+        int cellNum = row.getLastCellNum();
         TPublicdocmenu entity = new TPublicdocmenu();
         for (int j = 0; j < cellNum; j++) {
           Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TAutosprinklerController.java

@@ -163,7 +163,7 @@ public class TAutosprinklerController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAutosprinkler entity = new TAutosprinkler();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TEnvironapprcontController.java

@@ -137,7 +137,7 @@ public class TEnvironapprcontController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TEnvironapprcont entity = new TEnvironapprcont();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TEnvironapprovalController.java

@@ -153,7 +153,7 @@ public class TEnvironapprovalController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TEnvironapproval entity = new TEnvironapproval();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TEyewasherController.java

@@ -165,7 +165,7 @@ public class TEyewasherController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TEyewasher entity = new TEyewasher();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TFireapprovalController.java

@@ -151,7 +151,7 @@ public class TFireapprovalController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TFireapproval entity = new TFireapproval();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TFireextinguisherController.java

@@ -165,7 +165,7 @@ public class TFireextinguisherController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TFireextinguisher entity = new TFireextinguisher();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TFirehoseController.java

@@ -165,7 +165,7 @@ public class TFirehoseController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TFirehose entity = new TFirehose();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TFirehydrantController.java

@@ -164,7 +164,7 @@ public class TFirehydrantController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TFirehydrant entity = new TFirehydrant();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TFirestandpipeController.java

@@ -165,7 +165,7 @@ public class TFirestandpipeController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TFirestandpipe entity = new TFirestandpipe();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/THealthapprovalController.java

@@ -147,7 +147,7 @@ public class THealthapprovalController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 THealthapproval entity = new THealthapproval();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/THighpresfireController.java

@@ -165,7 +165,7 @@ public class THighpresfireController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 THighpresfire entity = new THighpresfire();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TIncidentRecordsController.java

@@ -150,7 +150,7 @@ public class TIncidentRecordsController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TIncidentRecords entity = new TIncidentRecords();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TJobticketController.java

@@ -371,7 +371,7 @@ public class TJobticketController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TJobticket entity = new TJobticket();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TMsdsController.java

@@ -156,7 +156,7 @@ public class TMsdsController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMsds entity = new TMsds();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TRcauditController.java

@@ -204,7 +204,7 @@ public class TRcauditController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TRcaudit entity = new TRcaudit();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TRcauditmenuController.java

@@ -192,7 +192,7 @@ public class TRcauditmenuController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TRcauditmenu entity = new TRcauditmenu();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TSafetyapprcontController.java

@@ -137,7 +137,7 @@ public class TSafetyapprcontController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSafetyapprcont entity = new TSafetyapprcont();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TSafetyapprovalController.java

@@ -154,7 +154,7 @@ public class TSafetyapprovalController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSafetyapproval entity = new TSafetyapproval();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TWasteBarrelmonthController.java

@@ -143,7 +143,7 @@ public class TWasteBarrelmonthController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TWasteBarrelmonth entity = new TWasteBarrelmonth();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TWasteDangerController.java

@@ -144,7 +144,7 @@ public class TWasteDangerController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TWasteDanger entity = new TWasteDanger();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TWasteDangerdayController.java

@@ -143,7 +143,7 @@ public class TWasteDangerdayController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TWasteDangerday entity = new TWasteDangerday();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TWasteDangermonthController.java

@@ -142,7 +142,7 @@ public class TWasteDangermonthController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TWasteDangermonth entity = new TWasteDangermonth();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/ehs/controller/TWasteWaterController.java

@@ -143,7 +143,7 @@ public class TWasteWaterController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TWasteWater entity = new TWasteWater();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/listener/pssr/ConfirmTaskCreateListener.java

@@ -52,7 +52,7 @@ public class ConfirmTaskCreateListener implements Serializable, TaskListener {
                     "<table cellpadding=\"0\" align=\"center\"" +
                     "style=\"width: 600px; margin: 0px auto; text-align: left; position: relative; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; font-size: 14px; font-family:微软雅黑, 黑体; line-height: 1.5; box-shadow: rgb(153, 153, 153) 0px 0px 5px; border-collapse: collapse; background-position: initial initial; background-repeat: initial initial;background:#fff;\">" +
                     "<tbody><tr><th valign=\"middle\" style=\"height: 25px; line-height: 25px; padding: 15px 35px; border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: #42a3d3; background-color: #49bcff; border-top-left-radius: 5px; border-top-right-radius: 5px; border-bottom-right-radius: 0px; border-bottom-left-radius: 0px;\">" +
-                    "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">预约开票管理系统 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">Reserve Invoice</font></th></tr>";
+                    "<font face=\"微软雅黑\" size=\"5\" style=\"color: rgb(255, 255, 255); \">PSSR检查确认 </font><font face=\"微软雅黑\" size=\"3\" style=\"color: rgb(255, 255, 255); \">PSSR</font></th></tr>";
             //表html中间内容
             String prime = "";
             String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +

master/src/main/java/com/ruoyi/project/plant/controller/TAwardrecordController.java

@@ -143,7 +143,7 @@ public class TAwardrecordController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAwardrecord entity = new TAwardrecord();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/plant/controller/TManageactivityController.java

@@ -142,7 +142,7 @@ public class TManageactivityController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TManageactivity entity = new TManageactivity();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/plant/controller/TStaffmgrController.java

@@ -770,7 +770,7 @@ public class TStaffmgrController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TStaffmgr entity = new TStaffmgr();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/plant/controller/TTargetreviewController.java

@@ -188,7 +188,7 @@ public class TTargetreviewController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-            //    int cellNum = row.getPhysicalNumberOfCells();
+            //    int cellNum = row.getLastCellNum();
                 if(row==null){
                     sheet.removeRow(row);
                     rowNum++;

master/src/main/java/com/ruoyi/project/process/controller/TAlarmmodifyController.java

@@ -150,7 +150,7 @@ public class TAlarmmodifyController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAlarmmodify entity = new TAlarmmodify();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/process/controller/TMocController.java

@@ -156,7 +156,7 @@ public class TMocController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMoc entity = new TMoc();
                 entity.setTimeliness("2");
                 entity.setTempCategory("1");
@@ -341,7 +341,7 @@ public class TMocController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMoc entity = new TMoc();
                 entity.setTimeliness("2");
                 entity.setTempCategory("2");
@@ -474,7 +474,7 @@ public class TMocController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMoc entity = new TMoc();
                 entity.setTimeliness("2");
                 entity.setTempCategory("3");
@@ -712,7 +712,7 @@ public class TMocController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMoc entity = new TMoc();
                 entity.setTimeliness("2");
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
@@ -939,7 +939,7 @@ public class TMocController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMoc entity = new TMoc();
                 entity.setTimeliness("1");
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());

master/src/main/java/com/ruoyi/project/production/controller/TAccidentController.java

@@ -315,7 +315,7 @@ public class TAccidentController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAccident entity = new TAccident();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/production/controller/TAlarmstatisticsDayController.java

@@ -143,7 +143,7 @@ public class TAlarmstatisticsDayController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAlarmstatisticsDay entity = new TAlarmstatisticsDay();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/production/controller/TAlarmstatisticsMonthController.java

@@ -155,7 +155,7 @@ public class TAlarmstatisticsMonthController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAlarmstatisticsMonth entity = new TAlarmstatisticsMonth();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/production/controller/TBlindController.java

@@ -144,7 +144,7 @@ public class TBlindController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TBlind entity = new TBlind();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/production/controller/TFivesRegionController.java

@@ -157,7 +157,7 @@ public class TFivesRegionController extends BaseController {
                 // 获取行里面的总列数
                 int columnNum = 0;
                 if (row != null) {
-                    columnNum = row.getPhysicalNumberOfCells();
+                    columnNum = row.getLastCellNum();
                 }
                 for (int j = 0; j < columnNum; j++) {
                     XSSFCell cell = sheet.getRow(i).getCell(j);

master/src/main/java/com/ruoyi/project/production/controller/TLbnhjstjController.java

@@ -143,7 +143,7 @@ public class TLbnhjstjController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TLbnhjstj entity = new TLbnhjstj();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportController.java

@@ -1433,7 +1433,7 @@ public class TMonthlyQualityReportController extends BaseController
         int successNumber = 0;
         for (Row row : listS0501) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS0501 entity = new TMonthlyQualityReportS0501();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1498,7 +1498,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS1301) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS1301 entity = new TMonthlyQualityReportS1301();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1559,7 +1559,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS2002) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS2002 entity = new TMonthlyQualityReportS2002();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1594,7 +1594,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS2005) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS2005 entity = new TMonthlyQualityReportS2005();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1629,7 +1629,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS2007) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS2007 entity = new TMonthlyQualityReportS2007();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1668,7 +1668,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS2011) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS2011 entity = new TMonthlyQualityReportS2011();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1705,7 +1705,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS2400) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS2400 entity = new TMonthlyQualityReportS2400();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1740,7 +1740,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS3004) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS3004 entity = new TMonthlyQualityReportS3004();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1777,7 +1777,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS3009) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS3009 entity = new TMonthlyQualityReportS3009();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1830,7 +1830,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS3010) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS3010 entity = new TMonthlyQualityReportS3010();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1883,7 +1883,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS3011) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS3011 entity = new TMonthlyQualityReportS3011();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1936,7 +1936,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS3012) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS3012 entity = new TMonthlyQualityReportS3012();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -1989,7 +1989,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS3022) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS3022 entity = new TMonthlyQualityReportS3022();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2026,7 +2026,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS4012) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS4012 entity = new TMonthlyQualityReportS4012();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2067,7 +2067,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS4013) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS4013 entity = new TMonthlyQualityReportS4013();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2110,7 +2110,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS4501) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS4501 entity = new TMonthlyQualityReportS4501();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2183,7 +2183,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS5001) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS5001 entity = new TMonthlyQualityReportS5001();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2226,7 +2226,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS5003) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS5003 entity = new TMonthlyQualityReportS5003();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2281,7 +2281,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS5010) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS5010 entity = new TMonthlyQualityReportS5010();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2326,7 +2326,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS5012) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS5012 entity = new TMonthlyQualityReportS5012();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2373,7 +2373,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS6101) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS6101 entity = new TMonthlyQualityReportS6101();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2446,7 +2446,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS6107) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS6107 entity = new TMonthlyQualityReportS6107();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2481,7 +2481,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listS6301) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportS6301 entity = new TMonthlyQualityReportS6301();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());
@@ -2536,7 +2536,7 @@ public class TMonthlyQualityReportController extends BaseController
         }
         for (Row row : listZ404) {
             try {
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TMonthlyQualityReportZ404 entity = new TMonthlyQualityReportZ404();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());

master/src/main/java/com/ruoyi/project/production/controller/TSaiApplyController.java

@@ -170,7 +170,7 @@ public class TSaiApplyController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSaiApply entity = new TSaiApply();
                 entity.setCreateTime(new Date());
                 entity.setCreateBy(userId.toString());

master/src/main/java/com/ruoyi/project/production/controller/TSaiController.java

@@ -218,7 +218,7 @@ public class TSaiController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSai entity = new TSai();
                 entity.setDelFlag("0");
                 entity.setDeptId(userService.selectUserById(userId).getDeptId());

master/src/main/java/com/ruoyi/project/production/controller/TWsglController.java

@@ -144,7 +144,7 @@ public class TWsglController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TWsgl entity = new TWsgl();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -115,6 +115,9 @@ public class TPssrAboveallController extends BaseController {
     @Log(title = "PSSR", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrAboveall tPssrAboveall) {
+        if (tPssrAboveall.getIncludePublic()==1) {
+            tPssrAboveall.setUnit(tPssrAboveall.getUnit()+",390");
+        }
         tPssrAboveallService.insertTPssrAboveall(tPssrAboveall);//新增主表数据
 
         String userId = getUserId().toString();
@@ -323,15 +326,15 @@ public class TPssrAboveallController extends BaseController {
      */
     private void genYfl(Long subId, String userId) {
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Electr. Power", "MWH", userId, new Date(), 0L));
-        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "LP steam", "/", userId, new Date(), 0L));
-        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "MP steam", "/", userId, new Date(), 0L));
-        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "HP steam", "Ton", userId, new Date(), 0L));
+        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "LP steam ", "Ton", userId, new Date(), 0L));
+        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "MP steam", "Ton", userId, new Date(), 0L));
+        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "HP steam ", "Ton", userId, new Date(), 0L));
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Potable water", "Ton", userId, new Date(), 0L));
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "production water", "Ton", userId, new Date(), 0L));
-        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "LP fire water", "/", userId, new Date(), 0L));
-        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "HP fire water", "/", userId, new Date(), 0L));
+        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "LP fire water", "Ton", userId, new Date(), 0L));
+        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "HP fire water", "Ton", userId, new Date(), 0L));
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Cooling water", "Ton", userId, new Date(), 0L));
-        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Demine Water", "Ton", userId, new Date(), 0L));
+        tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Polished Water", "Ton", userId, new Date(), 0L));
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Nitrogen", "Nm3", userId, new Date(), 0L));
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Plant Air", "Nm3", userId, new Date(), 0L));
         tPssrMaterialService.insertTPssrMaterial(new TPssrMaterial(subId, "Instrument Air", "Nm3", userId, new Date(), 0L));
@@ -377,7 +380,7 @@ public class TPssrAboveallController extends BaseController {
         tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统N2已投用或具备投用条件。", "界区阀已打开，N2总管压力390PI9114压力达    kpa。", "N2总管压力390PI9114压力达    kpa。", userId, new Date()));
         tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统IA已投用或具备投用条件：", "界区阀已打开，IA管压力PI3901压力达    kpa。", "IA管压力PI3901压力达    kpa。", userId, new Date()));
         tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统PA已投用或具备投用条件。", "界区阀已打开，PA管压力PI3902压力达    kpa。", "PA管压力PI3902压力达    kpa。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统CW已投用或具备投用条件。", "界区阀已打开，CW进出口压差达    kpa。", "CW进出口压差达    kap。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统CW已投用或具备投用条件。", "界区阀已打开，CW进出口压差达    kpa。", "CW进出口压差达    kpa。", userId, new Date()));
         tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统高压蒸汽已投用或具备投用条件。", "界区阀已打开，PC9112压力达    Mpa，TI9061温度达    ℃。", "PC9112压力达    Mpa，TI9061温度达    ℃。", userId, new Date()));
         tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统中压蒸汽已投用或具备投用条件。", "界区阀已打开，PC9081压力达    Mpa，TI9081温度达    ℃。", "PC9081压力达    Mpa，TI9081温度达    ℃。", userId, new Date()));
         tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统低压蒸汽已投用或具备投用条件。", "界区阀已打开，PY9109压力达    Mpa，TI9115温度达    ℃。", "PY9109压力达    Mpa，TI9115温度达    ℃。", userId, new Date()));

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

@@ -101,7 +101,7 @@ public class TPssrAirtightController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrAirtight entity = new TPssrAirtight();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -300,7 +300,7 @@ public class TPssrAirtightController extends BaseController {
             for (Long id : tPssrAirtight.getIds()) {
                 TPssrAirtight item = tPssrAirtightService.selectTPssrAirtightById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrAirtightService.updateTPssrAirtight(item);
@@ -310,7 +310,7 @@ public class TPssrAirtightController extends BaseController {
             lock.setSubId(tPssrAirtight.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrAirtight item : tPssrAirtightService.selectTPssrAirtightList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -96,7 +96,7 @@ public class TPssrAnalyzerController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrAnalyzer entity = new TPssrAnalyzer();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -321,7 +321,7 @@ public class TPssrAnalyzerController extends BaseController {
             for (Long id : tPssrAnalyzer.getIds()) {
                 TPssrAnalyzer item = tPssrAnalyzerService.selectTPssrAnalyzerById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrAnalyzerService.updateTPssrAnalyzer(item);
@@ -331,7 +331,7 @@ public class TPssrAnalyzerController extends BaseController {
             lock.setSubId(tPssrAnalyzer.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrAnalyzer item : tPssrAnalyzerService.selectTPssrAnalyzerList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -99,7 +99,7 @@ public class TPssrBlindController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrBlind entity = new TPssrBlind();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -415,9 +415,9 @@ public class TPssrBlindController extends BaseController {
                 // 新增驳回原因数据
                 TPssrTurndown turndown = new TPssrTurndown();
                 turndown.setForShort(forShort);
-                turndown.setSubId(blind.getSubId());
+                turndown.setSubId(pssrBlind.getSubId());
                 turndown.setItemId(blind.getId());
-                turndown.setReason(blind.getReason());
+                turndown.setReason(pssrBlind.getReason());
                 turndown.setCreatedate(new Date());
                 turndown.setCreaterCode(getUserId().toString());
                 tPssrTurndownService.insertTPssrTurndown(turndown);

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

@@ -99,7 +99,7 @@ public class TPssrCircuitController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrCircuit entity = new TPssrCircuit();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -341,7 +341,7 @@ public class TPssrCircuitController extends BaseController {
             for (Long id : tPssrCircuit.getIds()) {
                 TPssrCircuit item = tPssrCircuitService.selectTPssrCircuitById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrCircuitService.updateTPssrCircuit(item);
@@ -351,7 +351,7 @@ public class TPssrCircuitController extends BaseController {
             lock.setSubId(tPssrCircuit.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrCircuit item : tPssrCircuitService.selectTPssrCircuitList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -97,7 +97,7 @@ public class TPssrCleaningController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrCleaning entity = new TPssrCleaning();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -324,7 +324,7 @@ public class TPssrCleaningController extends BaseController {
             for (Long id : tPssrCleaning.getIds()) {
                 TPssrCleaning item = tPssrCleaningService.selectTPssrCleaningById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrCleaningService.updateTPssrCleaning(item);
@@ -334,7 +334,7 @@ public class TPssrCleaningController extends BaseController {
             lock.setSubId(tPssrCleaning.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrCleaning item : tPssrCleaningService.selectTPssrCleaningList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -94,7 +94,7 @@ public class TPssrFrameController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrFrame entity = new TPssrFrame();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -331,7 +331,7 @@ public class TPssrFrameController extends BaseController {
             for (Long id : tPssrFrame.getIds()) {
                 TPssrFrame item = tPssrFrameService.selectTPssrFrameById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrFrameService.updateTPssrFrame(item);
@@ -341,7 +341,7 @@ public class TPssrFrameController extends BaseController {
             lock.setSubId(tPssrFrame.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrFrame item : tPssrFrameService.selectTPssrFrameList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -94,7 +94,7 @@ public class TPssrFranklinismController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrFranklinism entity = new TPssrFranklinism();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -314,7 +314,7 @@ public class TPssrFranklinismController extends BaseController {
             for (Long id : tPssrFranklinism.getIds()) {
                 TPssrFranklinism item = tPssrFranklinismService.selectTPssrFranklinismById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrFranklinismService.updateTPssrFranklinism(item);
@@ -324,7 +324,7 @@ public class TPssrFranklinismController extends BaseController {
             lock.setSubId(tPssrFranklinism.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrFranklinism item : tPssrFranklinismService.selectTPssrFranklinismList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -94,7 +94,7 @@ public class TPssrGasdetectorController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrGasdetector entity = new TPssrGasdetector();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -319,7 +319,7 @@ public class TPssrGasdetectorController extends BaseController {
             for (Long id : tPssrGasdetector.getIds()) {
                 TPssrGasdetector item = tPssrGasdetectorService.selectTPssrGasdetectorById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrGasdetectorService.updateTPssrGasdetector(item);
@@ -329,7 +329,7 @@ public class TPssrGasdetectorController extends BaseController {
             lock.setSubId(tPssrGasdetector.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrGasdetector item : tPssrGasdetectorService.selectTPssrGasdetectorList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -97,7 +97,7 @@ public class TPssrHygieneController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrHygiene entity = new TPssrHygiene();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -308,7 +308,7 @@ public class TPssrHygieneController extends BaseController {
             for (Long id : tPssrHygiene.getIds()) {
                 TPssrHygiene item = tPssrHygieneService.selectTPssrHygieneById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrHygieneService.updateTPssrHygiene(item);
@@ -318,7 +318,7 @@ public class TPssrHygieneController extends BaseController {
             lock.setSubId(tPssrHygiene.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrHygiene item : tPssrHygieneService.selectTPssrHygieneList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -94,7 +94,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrInstrumentCalibration entity = new TPssrInstrumentCalibration();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -322,7 +322,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
             for (Long id : tPssrInstrumentCalibration.getIds()) {
                 TPssrInstrumentCalibration item = tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(item);
@@ -332,7 +332,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
             lock.setSubId(tPssrInstrumentCalibration.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrInstrumentCalibration item : tPssrInstrumentCalibrationService.selectTPssrInstrumentCalibrationList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -97,7 +97,7 @@ public class TPssrLaboratoryController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrLaboratory entity = new TPssrLaboratory();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -317,7 +317,7 @@ public class TPssrLaboratoryController extends BaseController {
             for (Long id : tPssrLaboratory.getIds()) {
                 TPssrLaboratory item = tPssrLaboratoryService.selectTPssrLaboratoryById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrLaboratoryService.updateTPssrLaboratory(item);
@@ -327,7 +327,7 @@ public class TPssrLaboratoryController extends BaseController {
             lock.setSubId(tPssrLaboratory.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrLaboratory item : tPssrLaboratoryService.selectTPssrLaboratoryList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -243,7 +243,7 @@ public class TPssrLightingController extends BaseController {
             for (Long id : tPssrLighting.getIds()) {
                 TPssrLighting item = tPssrLightingService.selectTPssrLightingById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrLightingService.updateTPssrLighting(item);
@@ -254,7 +254,7 @@ public class TPssrLightingController extends BaseController {
             lock.setApproveStatus(queryStatus);
             lock.setLightingType(tPssrLighting.getLightingType());
             for (TPssrLighting item : tPssrLightingService.selectTPssrLightingList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -294,7 +294,7 @@ public class TPssrLockController extends BaseController {
             for (Long id : tPssrLock.getIds()) {
                 TPssrLock item = tPssrLockService.selectTPssrLockById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && approveStatus == 2) {
+                if (approveStatus == 2) {
                     item.setConfirmationDate(date);
                 }
                 tPssrLockService.updateTPssrLock(item);
@@ -304,7 +304,7 @@ public class TPssrLockController extends BaseController {
             lock.setSubId(tPssrLock.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrLock item : tPssrLockService.selectTPssrLockList(lock)) {
-                if (item.getConfirmationDate() == null && approveStatus == 2) {
+                if (approveStatus == 2) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -345,7 +345,7 @@ public class TPssrMaterialController extends BaseController {
             material.setSubId(tPssrMaterial.getSubId());
             material.setApproveStatus(1L);
             for (TPssrMaterial item : tPssrMaterialService.selectTPssrMaterialList(material)) {
-                if (item.getConfirmationDate() == null && tPssrMaterial.getTaskType() == 5) {
+                if (tPssrMaterial.getTaskType() == 5) {
                     item.setConfirmationDate(new Date());
                 }
                 item.setApproveStatus(2L);

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

@@ -93,8 +93,8 @@ public class TPssrMaterialRawController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrMaterialRaw item = tPssrMaterialRawService.selectTPssrMaterialRawById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "yfl-raw"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl-raw"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "yfl-raw"));
         return AjaxResult.success(item);
     }
 
@@ -151,9 +151,7 @@ public class TPssrMaterialRawController extends BaseController {
         if (tPssrMaterialRaw.getIds() != null && tPssrMaterialRaw.getIds().length > 0) {
             for (Long id : tPssrMaterialRaw.getIds()) {
                 materialRaw = tPssrMaterialRawService.selectTPssrMaterialRawById(id);
-                if (materialRaw.getConfirmationDate() == null) {
-                    materialRaw.setConfirmationDate(new Date());
-                }
+                materialRaw.setConfirmationDate(new Date());
                 materialRaw.setApproveStatus(2L);
                 materialRaw.setUpdatedate(new Date());
                 materialRaw.setUpdaterCode(String.valueOf(getUserId()));
@@ -163,9 +161,7 @@ public class TPssrMaterialRawController extends BaseController {
             materialRaw.setSubId(tPssrMaterialRaw.getSubId());
             materialRaw.setApproveStatus(1L);
             for (TPssrMaterialRaw item : tPssrMaterialRawService.selectTPssrMaterialRawList(materialRaw)) {
-                if (item.getConfirmationDate() == null) {
-                    item.setConfirmationDate(new Date());
-                }
+                item.setConfirmationDate(new Date());
                 item.setApproveStatus(2L);
                 item.setUpdatedate(new Date());
                 item.setUpdaterCode(String.valueOf(getUserId()));

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

@@ -103,7 +103,7 @@ public class TPssrMeasureController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrMeasure entity = new TPssrMeasure();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -347,7 +347,7 @@ public class TPssrMeasureController extends BaseController {
             measure.setSubId(tPssrMeasure.getSubId());
             measure.setApproveStatus(queryStatus);
             for (TPssrMeasure item : tPssrMeasureService.selectTPssrMeasureList(measure)) {
-                if (item.getConfirmationDate() == null && tPssrMeasure.getTaskType() == 5) {
+                if (tPssrMeasure.getTaskType() == 5) {
                     item.setConfirmationDate(new Date());
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -292,7 +292,7 @@ public class TPssrMocController extends BaseController {
             for (Long id : tPssrMoc.getIds()) {
                 TPssrMoc item = tPssrMocService.selectTPssrMocById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrMocService.updateTPssrMoc(item);
@@ -302,7 +302,7 @@ public class TPssrMocController extends BaseController {
             lock.setSubId(tPssrMoc.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrMoc item : tPssrMocService.selectTPssrMocList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -95,7 +95,7 @@ public class TPssrMotorController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrMotor entity = new TPssrMotor();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -319,7 +319,7 @@ public class TPssrMotorController extends BaseController {
             for (Long id : tPssrMotor.getIds()) {
                 TPssrMotor item = tPssrMotorService.selectTPssrMotorById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrMotorService.updateTPssrMotor(item);
@@ -329,7 +329,7 @@ public class TPssrMotorController extends BaseController {
             lock.setSubId(tPssrMotor.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrMotor item : tPssrMotorService.selectTPssrMotorList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -99,7 +99,7 @@ public class TPssrNitrogenController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrNitrogen entity = new TPssrNitrogen();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -369,7 +369,7 @@ public class TPssrNitrogenController extends BaseController {
             for (Long id : tPssrNitrogen.getIds()) {
                 TPssrNitrogen item = tPssrNitrogenService.selectTPssrNitrogenById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrNitrogenService.updateTPssrNitrogen(item);
@@ -379,7 +379,7 @@ public class TPssrNitrogenController extends BaseController {
             lock.setSubId(tPssrNitrogen.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrNitrogen item : tPssrNitrogenService.selectTPssrNitrogenList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -51,7 +51,7 @@ import java.util.*;
 @RequestMapping("/pssr/overhaulExchanger")
 public class TPssrOverhaulExchangerController extends BaseController {
     @Resource
-     private TPssrOverhaulExchangerMapper tPssrOverhaulExchangerMapper;
+    private TPssrOverhaulExchangerMapper tPssrOverhaulExchangerMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 
@@ -160,19 +160,19 @@ public class TPssrOverhaulExchangerController extends BaseController {
             }
             switch (devType.toString()) {
                 case "1":
-                    filename =  "PSSR_01_检修项目_换热器_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_换热器_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
                 case "2":
-                    filename =  "PSSR_01_检修项目_电仪_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_电仪_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
                 case "3":
-                    filename =  "PSSR_01_检修项目_反应器_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_反应器_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
                 case "4":
-                    filename =  "PSSR_01_检修项目_裂解炉_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_裂解炉_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
                 case "5":
-                    filename =  "PSSR_01_检修项目_其他_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_其他_" + UUID.randomUUID().toString() + ".xlsx";
                     break;
             }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
@@ -193,8 +193,8 @@ public class TPssrOverhaulExchangerController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulExchanger item = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
         return AjaxResult.success(item);
     }
 
@@ -250,9 +250,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
         if (tPssrOverhaulExchanger.getIds() != null && tPssrOverhaulExchanger.getIds().length > 0) {
             for (Long id : tPssrOverhaulExchanger.getIds()) {
                 TPssrOverhaulExchanger exchanger = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id);
-                if (exchanger.getCompletionDate() == null) {
-                    exchanger.setCompletionDate(new Date());
-                }
+                exchanger.setCompletionDate(new Date());
                 exchanger.setApproveStatus(2L);
                 exchanger.setUpdatedate(new Date());
                 exchanger.setUpdaterCode(String.valueOf(getUserId()));
@@ -264,9 +262,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
             exchanger.setConfirmedPerson(getUserId().toString());
             exchanger.setApproveStatus(1L);
             for (TPssrOverhaulExchanger overhaulExchanger : tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(exchanger)) {
-                if (overhaulExchanger.getCompletionDate() == null) {
-                    overhaulExchanger.setCompletionDate(new Date());
-                }
+                overhaulExchanger.setCompletionDate(new Date());
                 overhaulExchanger.setApproveStatus(2L);
                 overhaulExchanger.setUpdatedate(new Date());
                 overhaulExchanger.setUpdaterCode(String.valueOf(getUserId()));
@@ -380,12 +376,11 @@ public class TPssrOverhaulExchangerController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulExchanger:add')")
     @PostMapping("/importData")
-    public AjaxResult importInterlockData(MultipartFile file, Long subId, Long devType) throws IOException
-    {
+    public AjaxResult importInterlockData(MultipartFile file, Long subId, Long devType) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TPssrOverhaulExchanger> list = new ArrayList<TPssrOverhaulExchanger>();
@@ -398,7 +393,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrOverhaulExchanger entity = new TPssrOverhaulExchanger();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -423,9 +418,9 @@ public class TPssrOverhaulExchangerController extends BaseController {
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
-                failRow.add(i+1);
+                failRow.add(i + 1);
             }
         }
         int successNumber = 0;
@@ -436,16 +431,16 @@ public class TPssrOverhaulExchangerController extends BaseController {
             try {
                 tPssrOverhaulExchangerService.insertTPssrOverhaulExchanger(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
-                failRow.add(failNum+1);
+                failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
     }
 }

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

@@ -87,12 +87,11 @@ public class TPssrOverhaulFilterController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulFilter:add')")
     @PostMapping("/importData")
-    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
-    {
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TPssrOverhaulFilter> list = new ArrayList<TPssrOverhaulFilter>();
@@ -105,7 +104,7 @@ public class TPssrOverhaulFilterController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrOverhaulFilter entity = new TPssrOverhaulFilter();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -135,9 +134,9 @@ public class TPssrOverhaulFilterController extends BaseController {
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
-                failRow.add(i+1);
+                failRow.add(i + 1);
             }
         }
         int successNumber = 0;
@@ -148,16 +147,16 @@ public class TPssrOverhaulFilterController extends BaseController {
             try {
                 tPssrOverhaulFilterService.insertTPssrOverhaulFilter(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
-                failRow.add(failNum+1);
+                failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
     }
 
@@ -322,7 +321,7 @@ public class TPssrOverhaulFilterController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_01_检修项目_过滤器_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_01_检修项目_过滤器_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -341,8 +340,8 @@ public class TPssrOverhaulFilterController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulFilter item = tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-glq"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-glq"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-glq"));
         return AjaxResult.success(item);
     }
 
@@ -396,9 +395,7 @@ public class TPssrOverhaulFilterController extends BaseController {
         if (tPssrOverhaulFilter.getIds() != null && tPssrOverhaulFilter.getIds().length > 0) {
             for (Long id : tPssrOverhaulFilter.getIds()) {
                 TPssrOverhaulFilter filter = tPssrOverhaulFilterService.selectTPssrOverhaulFilterById(id);
-                if (filter.getCompletionDate() == null) {
-                    filter.setCompletionDate(new Date());
-                }
+                filter.setCompletionDate(new Date());
                 filter.setApproveStatus(2L);
                 filter.setUpdatedate(new Date());
                 filter.setUpdaterCode(String.valueOf(getUserId()));
@@ -410,9 +407,7 @@ public class TPssrOverhaulFilterController extends BaseController {
             filter.setRespPerson(getUserId().toString());
             filter.setApproveStatus(1L);
             for (TPssrOverhaulFilter overhaulFilter : tPssrOverhaulFilterService.selectTPssrOverhaulFilterList(filter)) {
-                if (overhaulFilter.getCompletionDate() == null) {
-                    overhaulFilter.setCompletionDate(new Date());
-                }
+                overhaulFilter.setCompletionDate(new Date());
                 overhaulFilter.setApproveStatus(2L);
                 overhaulFilter.setUpdatedate(new Date());
                 overhaulFilter.setUpdaterCode(String.valueOf(getUserId()));

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

@@ -32,7 +32,7 @@ import java.util.*;
 @RequestMapping("/pssr/overhaulPipe")
 public class TPssrOverhaulPipeController extends BaseController {
     @Resource
-     private TPssrOverhaulPipeMapper tPssrOverhaulPipeMapper;
+    private TPssrOverhaulPipeMapper tPssrOverhaulPipeMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 
@@ -231,9 +231,7 @@ public class TPssrOverhaulPipeController extends BaseController {
         if (tPssrOverhaulPipe.getIds() != null && tPssrOverhaulPipe.getIds().length > 0) {
             for (Long id : tPssrOverhaulPipe.getIds()) {
                 TPssrOverhaulPipe pipe = tPssrOverhaulPipeService.selectTPssrOverhaulPipeById(id);
-                if (pipe.getConfirmationDate() == null) {
-                    pipe.setConfirmationDate(new Date());
-                }
+                pipe.setConfirmationDate(new Date());
                 pipe.setApproveStatus(2L);
                 pipe.setUpdatedate(new Date());
                 pipe.setUpdaterCode(String.valueOf(getUserId()));
@@ -245,9 +243,7 @@ public class TPssrOverhaulPipeController extends BaseController {
             pipe.setConfirmer(getUserId().toString());
             pipe.setApproveStatus(1L);
             for (TPssrOverhaulPipe overhaulPipe : tPssrOverhaulPipeService.selectTPssrOverhaulPipeList(pipe)) {
-                if (overhaulPipe.getConfirmationDate() == null) {
-                    overhaulPipe.setConfirmationDate(new Date());
-                }
+                overhaulPipe.setConfirmationDate(new Date());
                 overhaulPipe.setApproveStatus(2L);
                 overhaulPipe.setUpdatedate(new Date());
                 overhaulPipe.setUpdaterCode(String.valueOf(getUserId()));

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

@@ -32,7 +32,7 @@ import java.util.*;
 @RequestMapping("/pssr/overhaulPump")
 public class TPssrOverhaulPumpController extends BaseController {
     @Resource
-     private TPssrOverhaulPumpMapper tPssrOverhaulPumpMapper;
+    private TPssrOverhaulPumpMapper tPssrOverhaulPumpMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 
@@ -179,8 +179,8 @@ public class TPssrOverhaulPumpController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulPump item = tPssrOverhaulPumpService.selectTPssrOverhaulPumpById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-b"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-b"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-b"));
         return AjaxResult.success(item);
     }
 
@@ -215,6 +215,7 @@ public class TPssrOverhaulPumpController extends BaseController {
     public AjaxResult editb(@RequestBody TPssrOverhaulPump tPssrOverhaulPump) {
         return toAjax(tPssrOverhaulPumpMapper.updateTPssrOverhaulPumpByIds(tPssrOverhaulPump));
     }
+
     /**
      * 删除检修项目-泵
      */
@@ -232,9 +233,7 @@ public class TPssrOverhaulPumpController extends BaseController {
         if (tPssrOverhaulPump.getIds() != null && tPssrOverhaulPump.getIds().length > 0) {
             for (Long id : tPssrOverhaulPump.getIds()) {
                 TPssrOverhaulPump pump = tPssrOverhaulPumpService.selectTPssrOverhaulPumpById(id);
-                if (pump.getCompletionDate() == null) {
-                    pump.setCompletionDate(new Date());
-                }
+                pump.setCompletionDate(new Date());
                 pump.setApproveStatus(2L);
                 pump.setUpdatedate(new Date());
                 pump.setUpdaterCode(String.valueOf(getUserId()));
@@ -246,9 +245,7 @@ public class TPssrOverhaulPumpController extends BaseController {
             pump.setConfirmedPerson(getUserId().toString());
             pump.setApproveStatus(1L);
             for (TPssrOverhaulPump overhaulPump : tPssrOverhaulPumpService.selectTPssrOverhaulPumpList(pump)) {
-                if (overhaulPump.getCompletionDate() == null) {
-                    overhaulPump.setCompletionDate(new Date());
-                }
+                overhaulPump.setCompletionDate(new Date());
                 overhaulPump.setApproveStatus(2L);
                 overhaulPump.setUpdatedate(new Date());
                 overhaulPump.setUpdaterCode(String.valueOf(getUserId()));

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

@@ -48,8 +48,8 @@ import java.util.*;
 @RequestMapping("/pssr/overhaulTower")
 public class TPssrOverhaulTowerController extends BaseController {
     @Resource
-     private TPssrOverhaulTowerMapper tPssrOverhaulTowerMapper;
-        @Autowired
+    private TPssrOverhaulTowerMapper tPssrOverhaulTowerMapper;
+    @Autowired
     private ITPssrFileService tPssrFileService;
 
     @Autowired
@@ -87,12 +87,11 @@ public class TPssrOverhaulTowerController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:tPssrOverhaulTower:add')")
     @PostMapping("/importData")
-    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
-    {
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TPssrOverhaulTower> list = new ArrayList<TPssrOverhaulTower>();
@@ -105,7 +104,7 @@ public class TPssrOverhaulTowerController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrOverhaulTower entity = new TPssrOverhaulTower();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -129,9 +128,9 @@ public class TPssrOverhaulTowerController extends BaseController {
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
-                failRow.add(i+1);
+                failRow.add(i + 1);
             }
         }
         int successNumber = 0;
@@ -142,16 +141,16 @@ public class TPssrOverhaulTowerController extends BaseController {
             try {
                 tPssrOverhaulTowerService.insertTPssrOverhaulTower(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
-                failRow.add(failNum+1);
+                failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
     }
 
@@ -312,7 +311,7 @@ public class TPssrOverhaulTowerController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_01_检修项目_塔罐_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_01_检修项目_塔罐_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -331,8 +330,8 @@ public class TPssrOverhaulTowerController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulTower item = tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-tg"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-tg"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-tg"));
         return AjaxResult.success(item);
     }
 
@@ -385,9 +384,7 @@ public class TPssrOverhaulTowerController extends BaseController {
         if (tPssrOverhaulTower.getIds() != null && tPssrOverhaulTower.getIds().length > 0) {
             for (Long id : tPssrOverhaulTower.getIds()) {
                 TPssrOverhaulTower tower = tPssrOverhaulTowerService.selectTPssrOverhaulTowerById(id);
-                if (tower.getCompletionDate() == null) {
-                    tower.setCompletionDate(new Date());
-                }
+                tower.setCompletionDate(new Date());
                 tower.setApproveStatus(2L);
                 tower.setUpdatedate(new Date());
                 tower.setUpdaterCode(String.valueOf(getUserId()));
@@ -399,9 +396,7 @@ public class TPssrOverhaulTowerController extends BaseController {
             tower.setConfirmedPerson(getUserId().toString());
             tower.setApproveStatus(1L);
             for (TPssrOverhaulTower overhaulTower : tPssrOverhaulTowerService.selectTPssrOverhaulTowerList(tower)) {
-                if (overhaulTower.getCompletionDate() == null) {
-                    overhaulTower.setCompletionDate(new Date());
-                }
+                overhaulTower.setCompletionDate(new Date());
                 overhaulTower.setApproveStatus(2L);
                 overhaulTower.setUpdatedate(new Date());
                 overhaulTower.setUpdaterCode(String.valueOf(getUserId()));

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

@@ -48,7 +48,7 @@ import java.util.*;
 @RequestMapping("/pssr/overhaulValve")
 public class TPssrOverhaulValveController extends BaseController {
     @Resource
-     private TPssrOverhaulValveMapper tPssrOverhaulValveMapper;
+    private TPssrOverhaulValveMapper tPssrOverhaulValveMapper;
     @Autowired
     private ITPssrFileService tPssrFileService;
 
@@ -87,12 +87,11 @@ public class TPssrOverhaulValveController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:overhaulExchanger:add')")
     @PostMapping("/importData")
-    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
-    {
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TPssrOverhaulValve> list = new ArrayList<TPssrOverhaulValve>();
@@ -105,7 +104,7 @@ public class TPssrOverhaulValveController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrOverhaulValve entity = new TPssrOverhaulValve();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -137,9 +136,9 @@ public class TPssrOverhaulValveController extends BaseController {
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
-                failRow.add(i+1);
+                failRow.add(i + 1);
             }
         }
         int successNumber = 0;
@@ -150,16 +149,16 @@ public class TPssrOverhaulValveController extends BaseController {
             try {
                 tPssrOverhaulValveService.insertTPssrOverhaulValve(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
-                failRow.add(failNum+1);
+                failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
     }
 
@@ -325,7 +324,7 @@ public class TPssrOverhaulValveController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_01_检修项目_阀门_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_01_检修项目_阀门_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -344,8 +343,8 @@ public class TPssrOverhaulValveController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulValve item = tPssrOverhaulValveService.selectTPssrOverhaulValveById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "jxxm-fm"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-fm"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-fm"));
         return AjaxResult.success(item);
     }
 
@@ -380,6 +379,7 @@ public class TPssrOverhaulValveController extends BaseController {
     public AjaxResult editb(@RequestBody TPssrOverhaulValve tPssrOverhaulValve) {
         return toAjax(tPssrOverhaulValveMapper.updateTPssrOverhaulValveByIds(tPssrOverhaulValve));
     }
+
     /**
      * 删除检修项目-阀门
      */
@@ -397,9 +397,7 @@ public class TPssrOverhaulValveController extends BaseController {
         if (tPssrOverhaulValve.getIds() != null && tPssrOverhaulValve.getIds().length > 0) {
             for (Long id : tPssrOverhaulValve.getIds()) {
                 TPssrOverhaulValve valve = tPssrOverhaulValveService.selectTPssrOverhaulValveById(id);
-                if (valve.getDoneDate() == null) {
-                    valve.setDoneDate(new Date());
-                }
+                valve.setDoneDate(new Date());
                 valve.setApproveStatus(2L);
                 valve.setUpdatedate(new Date());
                 valve.setUpdaterCode(String.valueOf(getUserId()));
@@ -411,9 +409,7 @@ public class TPssrOverhaulValveController extends BaseController {
             valve.setIdentifyingPerson(getUserId().toString());
             valve.setApproveStatus(1L);
             for (TPssrOverhaulValve overhaulValve : tPssrOverhaulValveService.selectTPssrOverhaulValveList(valve)) {
-                if (overhaulValve.getDoneDate() == null) {
-                    overhaulValve.setDoneDate(new Date());
-                }
+                overhaulValve.setDoneDate(new Date());
                 overhaulValve.setApproveStatus(2L);
                 overhaulValve.setUpdatedate(new Date());
                 overhaulValve.setUpdaterCode(String.valueOf(getUserId()));

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

@@ -293,7 +293,7 @@ public class TPssrPipeController extends BaseController {
         if (tPssrPipe.getIds() != null && tPssrPipe.getIds().length > 0) {
             for (Long id : tPssrPipe.getIds()) {
                 pipe = tPssrPipeService.selectTPssrPipeById(id);
-                if (pipe.getConfirmationDate() == null) {
+                if (queryStatus == 3) {
                     pipe.setConfirmationDate(new Date());
                 }
                 pipe.setApproveStatus(approveStatus);
@@ -305,7 +305,7 @@ public class TPssrPipeController extends BaseController {
             pipe.setSubId(tPssrPipe.getSubId());
             pipe.setApproveStatus(queryStatus);
             for (TPssrPipe item : tPssrPipeService.selectTPssrPipeList(pipe)) {
-                if (item.getConfirmationDate() == null) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(new Date());
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -234,7 +234,7 @@ public class TPssrPowerController extends BaseController {
             for (Long id : tPssrPower.getIds()) {
                 TPssrPower item = tPssrPowerService.selectTPssrPowerById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 tPssrPowerService.updateTPssrPower(item);
@@ -244,7 +244,7 @@ public class TPssrPowerController extends BaseController {
             lock.setSubId(tPssrPower.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrPower item : tPssrPowerService.selectTPssrPowerList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -105,7 +105,7 @@ public class TPssrProtectionController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrProtection entity = new TPssrProtection();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -325,7 +325,7 @@ public class TPssrProtectionController extends BaseController {
         if (tPssrProtection.getIds() != null && tPssrProtection.getIds().length > 0) {
             for (Long id : tPssrProtection.getIds()) {
                 protection = tPssrProtectionService.selectTPssrProtectionById(id);
-                if (protection.getConfirmationDate() == null) {
+                if (queryStatus == 3) {
                     protection.setConfirmationDate(new Date());
                 }
                 protection.setApproveStatus(approveStatus);
@@ -337,7 +337,7 @@ public class TPssrProtectionController extends BaseController {
             protection.setSubId(tPssrProtection.getSubId());
             protection.setApproveStatus(queryStatus);
             for (TPssrProtection item : tPssrProtectionService.selectTPssrProtectionList(protection)) {
-                if (item.getConfirmationDate() == null) {
+                if (queryStatus == 3) {
                     item.setConfirmationDate(new Date());
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -35,9 +35,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * 公用工程Controller
@@ -142,7 +141,7 @@ public class TPssrPublicController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_17_公用工程_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_17_公用工程_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -181,26 +180,44 @@ public class TPssrPublicController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPublic tPssrPublic) {
         try {
-            String checkRequire = tPssrPublic.getCheckRequire();
-            String checkCondition = tPssrPublic.getCheckCondition();
+            String checkRequire = tPssrPublic.getCheckRequire().replace(" ", "");
+            String checkCondition = tPssrPublic.getCheckCondition().replace(" ", "");
             String valveStatus = tPssrPublic.getValveStatus();
-
-            // 提取值
-            Double[] conditionValues = extractValues(checkCondition.replace(" ",""));
-            Double[] requireValues = extractValues(checkRequire.replace(" ",""));
-
-            // 比对逻辑
-            if (conditionValues != null && requireValues != null) {
-                boolean isSatisfied = compareValues(conditionValues, requireValues);
-
-                // 输出结果
-                if (isSatisfied) {
+            if (!"已打开".equals(valveStatus)) {
+                tPssrPublic.setCheckResult("✖");
+            } else if (checkRequire.contains("达") && checkCondition.contains("达")) {
+                String rKpa = "0";
+                String rycKpa = "0";
+                String rTemp = "0";
+                String rMpa = "0";
+                String cKpa = "-1";
+                String cTemp = "-1";
+                String cMpa = "-1";
+                String cycKpa = "-1";
+                if (checkRequire.contains("压力达") && checkRequire.contains("kpa"))
+                    rKpa = checkRequire.substring(checkRequire.indexOf("压力达") + 3, checkRequire.indexOf("kpa")).trim();
+                if (checkRequire.contains("压差达"))
+                    rycKpa = checkRequire.substring(checkRequire.indexOf("压差达") + 3, checkRequire.indexOf("kpa")).trim();
+                if (checkRequire.contains("温度达"))
+                    rTemp = checkRequire.substring(checkRequire.indexOf("温度达") + 3, checkRequire.indexOf("℃")).trim();
+                if (checkRequire.contains("压力达") && checkRequire.contains("Mpa"))
+                    rMpa = checkRequire.substring(checkRequire.indexOf("压力达") + 3, checkRequire.indexOf("Mpa")).trim();
+                if (checkCondition.contains("压力达") && checkCondition.contains("kpa"))
+                    cKpa = checkCondition.substring(checkCondition.indexOf("压力达") + 3, checkCondition.indexOf("kpa")).trim();
+                if (checkCondition.contains("压差达"))
+                    cycKpa = checkCondition.substring(checkCondition.indexOf("压差达") + 3, checkCondition.indexOf("kpa")).trim();
+                if (checkCondition.contains("温度达"))
+                    cTemp = checkCondition.substring(checkCondition.indexOf("温度达") + 3, checkCondition.indexOf("℃")).trim();
+                if (checkCondition.contains("压力达") && checkCondition.contains("Mpa"))
+                    cMpa = checkCondition.substring(checkCondition.indexOf("压力达") + 3, checkCondition.indexOf("Mpa")).trim();
+
+                if (new BigDecimal(rKpa).compareTo(new BigDecimal(cKpa)) <= 0 || new BigDecimal(rycKpa).compareTo(new BigDecimal(cycKpa)) <= 0 ||
+                        (new BigDecimal(rTemp).compareTo(new BigDecimal(cTemp)) <= 0 && new BigDecimal(rMpa).compareTo(new BigDecimal(cMpa)) <= 0)
+                        || (new BigDecimal(rMpa).compareTo(new BigDecimal(cMpa)) <= 0 && !checkRequire.contains("℃"))) {
                     tPssrPublic.setCheckResult("✔");
                 } else {
                     tPssrPublic.setCheckResult("✖");
                 }
-            } else {
-
             }
         } catch (Exception e) {
             logger.error(e.getMessage());
@@ -215,25 +232,7 @@ public class TPssrPublicController extends BaseController {
      * @return 返回 [压力值, 温度值] 数组；如果格式不正确，返回 null
      */
     public static Double[] extractValues(String input) {
-        // 正则表达式动态匹配“压力达”或“压差达”，并提取纯数值和单位
-        String regex = "(压力达|压差达)\\s*(\\d+(\\.\\d+)?)\\s*(kpa|Mpa).*?" +
-                "温度达\\s*(\\d+(\\.\\d+)?)\\s*℃";
-        Pattern pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
-        Matcher matcher = pattern.matcher(input);
-
-        if (matcher.find()) {
-            // 提取压力/压差值
-            double value = Double.parseDouble(matcher.group(2));
-
-            // 提取温度值（可能为空）
-            Double temperature = null;
-            if (matcher.group(5) != null) {
-                temperature = Double.parseDouble(matcher.group(5));
-            }
 
-            // 如果温度值为空，只返回压力/压差值
-            return temperature != null ? new Double[]{value, temperature} : new Double[]{value};
-        }
         return null;
     }
 

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

@@ -105,7 +105,7 @@ public class TPssrPumpCleaningController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrPumpCleaning entity = new TPssrPumpCleaning();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -346,7 +346,7 @@ public class TPssrPumpCleaningController extends BaseController {
             pumpCleaning.setSubId(tPssrPumpCleaning.getSubId());
             pumpCleaning.setApproveStatus(queryStatus);
             for (TPssrPumpCleaning item : tPssrPumpCleaningService.selectTPssrPumpCleaningList(pumpCleaning)) {
-                if (item.getConfirmationDate() == null && tPssrPumpCleaning.getTaskType() == 5) {
+                if (tPssrPumpCleaning.getTaskType() == 5) {
                     item.setConfirmationDate(new Date());
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -105,7 +105,7 @@ public class TPssrPumpFillController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrPumpFill entity = new TPssrPumpFill();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -349,7 +349,7 @@ public class TPssrPumpFillController extends BaseController {
             pumpFill.setSubId(tPssrPumpFill.getSubId());
             pumpFill.setApproveStatus(queryStatus);
             for (TPssrPumpFill item : tPssrPumpFillService.selectTPssrPumpFillList(pumpFill)) {
-                if (item.getConfirmationDate() == null && tPssrPumpFill.getTaskType() == 5) {
+                if (tPssrPumpFill.getTaskType() == 5) {
                     item.setConfirmationDate(new Date());
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -105,7 +105,7 @@ public class TPssrPumpOverhaulController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrPumpOverhaul entity = new TPssrPumpOverhaul();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);
@@ -344,7 +344,7 @@ public class TPssrPumpOverhaulController extends BaseController {
             pumpOverhaul.setSubId(tPssrPumpOverhaul.getSubId());
             pumpOverhaul.setApproveStatus(queryStatus);
             for (TPssrPumpOverhaul item : tPssrPumpOverhaulService.selectTPssrPumpOverhaulList(pumpOverhaul)) {
-                if (item.getConfirmationDate() == null && tPssrPumpOverhaul.getTaskType() == 5) {
+                if (tPssrPumpOverhaul.getTaskType() == 5) {
                     item.setConfirmationDate(new Date());
                 }
                 item.setApproveStatus(approveStatus);

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

@@ -88,7 +88,7 @@ public class TPssrSafetyBleedController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrSafetyBleed entity = new TPssrSafetyBleed();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);

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

@@ -88,7 +88,7 @@ public class TPssrSafetyBreathController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrSafetyBreath entity = new TPssrSafetyBreath();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);

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

@@ -88,7 +88,7 @@ public class TPssrSafetyBrustController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrSafetyBrust entity = new TPssrSafetyBrust();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);

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

@@ -86,9 +86,7 @@ public class TPssrSafetyController extends BaseController {
         if (tPssrSafetyBleed.getIds() != null && tPssrSafetyBleed.getIds().length > 0) {
             for (Long id : tPssrSafetyBleed.getIds()) {
                 bleed = tPssrSafetyBleedService.selectTPssrSafetyBleedById(id);
-                if (bleed.getConfirmationTime() == null) {
-                    bleed.setConfirmationTime(new Date());
-                }
+                bleed.setConfirmationTime(new Date());
                 bleed.setApproveStatus(approveStatus);
                 bleed.setUpdatedate(new Date());
                 bleed.setUpdaterCode(String.valueOf(getUserId()));
@@ -98,9 +96,7 @@ public class TPssrSafetyController extends BaseController {
             bleed.setSubId(tPssrSafetyBleed.getSubId());
             bleed.setApproveStatus(queryStatus);
             for (TPssrSafetyBleed safetyBleed : tPssrSafetyBleedService.selectTPssrSafetyBleedList(bleed)) {
-                if (safetyBleed.getConfirmationTime() == null) {
-                    safetyBleed.setConfirmationTime(new Date());
-                }
+                safetyBleed.setConfirmationTime(new Date());
                 safetyBleed.setApproveStatus(approveStatus);
                 safetyBleed.setUpdatedate(new Date());
                 safetyBleed.setUpdaterCode(String.valueOf(getUserId()));
@@ -161,9 +157,7 @@ public class TPssrSafetyController extends BaseController {
         if (tPssrSafetyBreath.getIds() != null && tPssrSafetyBreath.getIds().length > 0) {
             for (Long id : tPssrSafetyBreath.getIds()) {
                 breath = tPssrSafetyBreathService.selectTPssrSafetyBreathById(id);
-                if (breath.getConfirmationTime() == null) {
-                    breath.setConfirmationTime(new Date());
-                }
+                breath.setConfirmationTime(new Date());
                 breath.setApproveStatus(approveStatus);
                 breath.setUpdatedate(new Date());
                 breath.setUpdaterCode(String.valueOf(getUserId()));
@@ -173,9 +167,7 @@ public class TPssrSafetyController extends BaseController {
             breath.setSubId(tPssrSafetyBreath.getSubId());
             breath.setApproveStatus(queryStatus);
             for (TPssrSafetyBreath safetyBreath : tPssrSafetyBreathService.selectTPssrSafetyBreathList(breath)) {
-                if (safetyBreath.getConfirmationTime() == null) {
-                    safetyBreath.setConfirmationTime(new Date());
-                }
+                safetyBreath.setConfirmationTime(new Date());
                 safetyBreath.setApproveStatus(approveStatus);
                 safetyBreath.setUpdatedate(new Date());
                 safetyBreath.setUpdaterCode(String.valueOf(getUserId()));
@@ -236,9 +228,7 @@ public class TPssrSafetyController extends BaseController {
         if (tPssrSafetyBrust.getIds() != null && tPssrSafetyBrust.getIds().length > 0) {
             for (Long id : tPssrSafetyBrust.getIds()) {
                 brust = tPssrSafetyBrustService.selectTPssrSafetyBrustById(id);
-                if (brust.getConfirmationTime() == null) {
-                    brust.setConfirmationTime(new Date());
-                }
+                brust.setConfirmationTime(new Date());
                 brust.setApproveStatus(approveStatus);
                 brust.setUpdatedate(new Date());
                 brust.setUpdaterCode(String.valueOf(getUserId()));
@@ -248,9 +238,7 @@ public class TPssrSafetyController extends BaseController {
             brust.setSubId(tPssrSafetyBrust.getSubId());
             brust.setApproveStatus(queryStatus);
             for (TPssrSafetyBrust safetyBrust : tPssrSafetyBrustService.selectTPssrSafetyBrustList(brust)) {
-                if (safetyBrust.getConfirmationTime() == null) {
-                    safetyBrust.setConfirmationTime(new Date());
-                }
+                safetyBrust.setConfirmationTime(new Date());
                 safetyBrust.setApproveStatus(approveStatus);
                 safetyBrust.setUpdatedate(new Date());
                 safetyBrust.setUpdaterCode(String.valueOf(getUserId()));
@@ -311,9 +299,7 @@ public class TPssrSafetyController extends BaseController {
         if (tPssrSafetyFlamearrester.getIds() != null && tPssrSafetyFlamearrester.getIds().length > 0) {
             for (Long id : tPssrSafetyFlamearrester.getIds()) {
                 flamearrester = tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterById(id);
-                if (flamearrester.getConfirmationTime() == null) {
-                    flamearrester.setConfirmationTime(new Date());
-                }
+                flamearrester.setConfirmationTime(new Date());
                 flamearrester.setApproveStatus(approveStatus);
                 flamearrester.setUpdatedate(new Date());
                 flamearrester.setUpdaterCode(String.valueOf(getUserId()));
@@ -323,9 +309,7 @@ public class TPssrSafetyController extends BaseController {
             flamearrester.setSubId(tPssrSafetyFlamearrester.getSubId());
             flamearrester.setApproveStatus(queryStatus);
             for (TPssrSafetyFlamearrester safetyFlamearrester : tPssrSafetyFlamearresterService.selectTPssrSafetyFlamearresterList(flamearrester)) {
-                if (safetyFlamearrester.getConfirmationTime() == null) {
-                    safetyFlamearrester.setConfirmationTime(new Date());
-                }
+                safetyFlamearrester.setConfirmationTime(new Date());
                 safetyFlamearrester.setApproveStatus(approveStatus);
                 safetyFlamearrester.setUpdatedate(new Date());
                 safetyFlamearrester.setUpdaterCode(String.valueOf(getUserId()));
@@ -386,9 +370,7 @@ public class TPssrSafetyController extends BaseController {
         if (tPssrSafetyValve.getIds() != null && tPssrSafetyValve.getIds().length > 0) {
             for (Long id : tPssrSafetyValve.getIds()) {
                 valve = tPssrSafetyValveService.selectTPssrSafetyValveById(id);
-                if (valve.getConfirmationTime() == null) {
-                    valve.setConfirmationTime(new Date());
-                }
+                valve.setConfirmationTime(new Date());
                 valve.setApproveStatus(approveStatus);
                 valve.setUpdatedate(new Date());
                 valve.setUpdaterCode(String.valueOf(getUserId()));
@@ -398,9 +380,7 @@ public class TPssrSafetyController extends BaseController {
             valve.setSubId(tPssrSafetyValve.getSubId());
             valve.setApproveStatus(queryStatus);
             for (TPssrSafetyValve safetyValve : tPssrSafetyValveService.selectTPssrSafetyValveList(valve)) {
-                if (safetyValve.getConfirmationTime() == null) {
-                    safetyValve.setConfirmationTime(new Date());
-                }
+                safetyValve.setConfirmationTime(new Date());
                 safetyValve.setApproveStatus(approveStatus);
                 safetyValve.setUpdatedate(new Date());
                 safetyValve.setUpdaterCode(String.valueOf(getUserId()));

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

@@ -88,7 +88,7 @@ public class TPssrSafetyFlamearresterController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPssrSafetyFlamearrester entity = new TPssrSafetyFlamearrester();
                 entity.setDeptId(userService.selectUserById(getUserId()).getDeptId());
                 entity.setSubId(subId);

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

@@ -243,7 +243,7 @@ public class TPssrTorchvocController extends BaseController {
             for (Long id : tPssrTorchvoc.getIds()) {
                 TPssrTorchvoc item = tPssrTorchvocService.selectTPssrTorchvocById(id);
                 item.setApproveStatus(approveStatus);
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     if ("火炬系统检修时所加装的盲板已拆除。".equals(item.getContent())) {
                         TPssrBlind tPssrBlind = new TPssrBlind();
                         tPssrBlind.setSubId(item.getSubId());
@@ -261,7 +261,7 @@ public class TPssrTorchvocController extends BaseController {
             lock.setApproveStatus(queryStatus);
             lock.setTorchvocType(tPssrTorchvoc.getTorchvocType());
             for (TPssrTorchvoc item : tPssrTorchvocService.selectTPssrTorchvocList(lock)) {
-                if (item.getConfirmationDate() == null && queryStatus == 3) {
+                if (queryStatus == 3) {
                     if ("火炬系统检修时所加装的盲板已拆除。".equals(item.getContent())) {
                         //查询当前检查内容数据
                         TPssrSubcontent subcontent = tPssrSubcontentService.selectTPssrSubcontentById(item.getSubId());

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

@@ -140,8 +140,8 @@ public class TPssrVesselController extends BaseController {
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
-                    String confirm1 =  sysUser1.getSignUrl();
-                    String confirm2 =  sysUser2.getSignUrl();
+                    String confirm1 = sysUser1.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);
                 } catch (NumberFormatException e) {
@@ -157,7 +157,7 @@ public class TPssrVesselController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_22_压力容器_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_22_压力容器_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -176,8 +176,8 @@ public class TPssrVesselController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrVessel item = tPssrVesselService.selectTPssrVesselById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "ylrq"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylrq"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "ylrq"));
         return AjaxResult.success(item);
     }
 
@@ -292,9 +292,7 @@ public class TPssrVesselController extends BaseController {
         if (tPssrVessel.getIds() != null && tPssrVessel.getIds().length > 0) {
             for (Long id : tPssrVessel.getIds()) {
                 vessel = tPssrVesselService.selectTPssrVesselById(id);
-                if (vessel.getConfirmationDate() == null) {
-                    vessel.setConfirmationDate(new Date());
-                }
+                vessel.setConfirmationDate(new Date());
                 vessel.setApproveStatus(approveStatus);
                 vessel.setUpdatedate(new Date());
                 vessel.setUpdaterCode(String.valueOf(getUserId()));
@@ -304,9 +302,7 @@ public class TPssrVesselController extends BaseController {
             vessel.setSubId(tPssrVessel.getSubId());
             vessel.setApproveStatus(queryStatus);
             for (TPssrVessel item : tPssrVesselService.selectTPssrVesselList(vessel)) {
-                if (item.getConfirmationDate() == null) {
-                    item.setConfirmationDate(new Date());
-                }
+                item.setConfirmationDate(new Date());
                 item.setApproveStatus(approveStatus);
                 item.setUpdatedate(new Date());
                 item.setUpdaterCode(String.valueOf(getUserId()));

master/src/main/java/com/ruoyi/project/reliability/controller/TAbnormalreportController.java

@@ -182,7 +182,7 @@ public class TAbnormalreportController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAbnormalreport entity = new TAbnormalreport();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/reliability/controller/TAssetlistController.java

@@ -143,7 +143,7 @@ public class TAssetlistController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TAssetlist entity = new TAssetlist();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/reliability/controller/TBamOriginalController.java

@@ -199,7 +199,7 @@ public class TBamOriginalController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TBamOriginal entity = new TBamOriginal();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/reliability/controller/TKkxglcsController.java

@@ -200,7 +200,7 @@ public class TKkxglcsController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TKkxglcs entity = new TKkxglcs();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/reliability/controller/TPreventivemaintenanceController.java

@@ -214,7 +214,7 @@ public class TPreventivemaintenanceController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TPreventivemaintenance entity = new TPreventivemaintenance();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/reliability/controller/TQualitativeAnalysisController.java

@@ -141,7 +141,7 @@ public class TQualitativeAnalysisController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TQualitativeAnalysis entity = new TQualitativeAnalysis();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/reliability/controller/TSafetyvavleController.java

@@ -177,7 +177,7 @@ public class TSafetyvavleController extends BaseController
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSafetyvavle entity = new TSafetyvavle();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

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

@@ -252,7 +252,7 @@ public class TSpecdevDtController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TSpecdevDt entity = new TSpecdevDt();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);

master/src/main/java/com/ruoyi/project/shiftmgr/controller/TShiftRosterController.java

@@ -122,7 +122,7 @@ public class TShiftRosterController extends BaseController {
             try {
                 logger.info("读取行数：" + i);
                 Row row = sheet.getRow(i);
-                int cellNum = row.getPhysicalNumberOfCells();
+                int cellNum = row.getLastCellNum();
                 TShiftRoster entity = new TShiftRoster();
                 for (int j = 0; j < cellNum; j++) {
                     Cell cell = row.getCell(j);