Merge remote-tracking branch 'origin/master'

master/src/main/java/com/ruoyi/project/common/CommonController.java

@@ -407,7 +407,7 @@ public class CommonController extends BaseController
             downloadname = "PSSR安全设施-泄放阀导入模板.xlsx";
             url = "static/template/pssr/safetyBleed.xlsx";
         }else if( type.equals("safetyFlamearrester") ) {
-            downloadname = "PSSR安全设施-灭火器导入模板.xlsx";
+            downloadname = "PSSR安全设施-阻火器导入模板.xlsx";
             url = "static/template/pssr/safetyFlamearrester.xlsx";
         }
 

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

@@ -94,20 +94,22 @@ public class TPssrSafetyFlamearresterController extends BaseController {
                     String cellValue = ExcelUtils.getCellValue(cell);
                     logger.info("cellValue:" + cellValue);
                     if (j == 0) {
-                        entity.setDevNo(cellValue);
+                        entity.setUnit(cellValue);
                     } else if (j == 1) {
-                        entity.setInstallLocation(cellValue);
+                        entity.setDevNo(cellValue);
                     } else if (j == 2) {
-                        entity.setUniformFlow(cellValue);
+                        entity.setInstallLocation(cellValue);
                     } else if (j == 3) {
-                        entity.setCorrosion(cellValue);
+                        entity.setUniformFlow(cellValue);
                     } else if (j == 4) {
-                        entity.setPutUse(cellValue);
+                        entity.setCorrosion(cellValue);
                     } else if (j == 5) {
+                        entity.setPutUse(cellValue);
+                    } else if (j == 6) {
                         if (cellValue.length() > 3) {
                             entity.setConfirmationTime(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 6) {
+                    } else if (j == 7) {
                         entity.setRemarks(cellValue);
                     }
                 }

ui/src/views/pssr/safetyFlamearrester/index.vue

@@ -166,7 +166,7 @@
       <el-table-column label="检查日期" align="center" prop="confirmationTime" :show-overflow-tooltip="true"
                        width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.confirmationTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>