PSSR导入功能修改

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

@@ -119,20 +119,6 @@ public class TPssrAirtightController extends BaseController {
                         entity.setAirtightMedium(cellValue);
                     }else if (j == 3) {
                         entity.setAirtightPressure(cellValue);
-                    } else if (j == 4) {
-                        entity.setInitialPressure(cellValue);
-                    } else if (j == 5) {
-                        entity.setFinalPressure(cellValue);
-                    } else if (j == 6) {
-                        entity.setStandard(cellValue);
-                    } else if (j == 7) {
-                        entity.setUptoStandard(cellValue);
-                    } else if (j == 8) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 9) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -113,16 +113,6 @@ public class TPssrAnalyzerController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
-                    } else if (j == 2) {
-                        entity.setVisualInspection(cellValue);
-                    } else if (j == 3) {
-                        entity.setFunctionalCheck(cellValue);
-                    } else if (j == 4) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 5) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -130,12 +130,6 @@ public class TPssrBlindController extends BaseController {
                         entity.setLocation(cellValue);
                     } else if (j == 10) {
                         entity.setStartupStatus(cellValue);
-                    } else if (j == 11) {
-                        entity.setActualStatus(cellValue);
-                    } else if (j == 12) {
-                        entity.setSatisfy(cellValue);
-                    } else if (j == 13) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -125,16 +125,6 @@ public class TPssrCircuitController extends BaseController {
                         entity.setCircuitSize(cellValue);
                     } else if (j == 7) {
                         entity.setRightStatus(cellValue);
-                    } else if (j == 8) {
-                        entity.setCurrentStatus(cellValue);
-                    } else if (j == 9) {
-                        entity.setCurrentStatusRight(cellValue);
-                    } else if (j == 10) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 11) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -116,16 +116,6 @@ public class TPssrCleaningController extends BaseController {
                         entity.setDevNo(cellValue);
                     } else if (j == 2) {
                         entity.setSerialNumber(Long.parseLong(cellValue));
-                    } else if (j == 3) {
-                        entity.setCheckContent(cellValue);
-                    } else if (j == 4) {
-                        entity.setCheckResult(cellValue);
-                    } else if (j == 5) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 6) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -109,18 +109,6 @@ public class TPssrGasdetectorController extends BaseController {
                     logger.info("cellValue:" + cellValue);
                     if (j == 0) {
                         entity.setDevNo(cellValue);
-                    } else if (j == 1) {
-                        entity.setVisualInspection(cellValue);
-                    } else if (j == 2) {
-                        entity.setRaincoverCheck(cellValue);
-                    } else if (j == 3) {
-                        entity.setDisplayCheck(cellValue);
-                    } else if (j == 4) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 5) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -111,18 +111,6 @@ public class TPssrInstrumentCalibrationController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
-                    } else if (j == 2) {
-                        entity.setVisualInspection(cellValue);
-                    } else if (j == 3) {
-                        entity.setInstallationInspection(cellValue);
-                    } else if (j == 4) {
-                        entity.setFunctionalCheck(cellValue);
-                    } else if (j == 5) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 6) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -113,16 +113,6 @@ public class TPssrLaboratoryController extends BaseController {
                         entity.setName(cellValue);
                     } else if (j == 2) {
                         entity.setSerialNumber(cellValue);
-                    } else if (j == 3) {
-                        entity.setVisualInspection(cellValue);
-                    } else if (j == 4) {
-                        entity.setFunctionalCheck(cellValue);
-                    }else if (j == 5) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 6) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -119,18 +119,6 @@ public class TPssrMeasureController extends BaseController {
                         entity.setDevName(cellValue);
                     } else if (j == 2) {
                         entity.setProMeasure(cellValue);
-                    } else if (j == 3) {
-                        entity.setNoDamage(cellValue);
-                    } else if (j == 4) {
-                        entity.setLocked(cellValue);
-                    } else if (j == 5) {
-                        entity.setNoWorn(cellValue);
-                    } else if (j == 6) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 7) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -112,16 +112,6 @@ public class TPssrMotorController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
-                    } else if (j == 2) {
-                        entity.setVisualInspection(cellValue);
-                    } else if (j == 3) {
-                        entity.setFunctionalCheck(cellValue);
-                    } else if (j == 4) {
-                        if (cellValue.length() > 3) {
-                            entity.setConfirmationDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 5) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -82,17 +82,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['pssr:frame:edit']"
-          v-if="isApprove==0"
-        >导入
-        </el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="info"-->
+          <!--icon="el-icon-upload2"-->
+          <!--size="mini"-->
+          <!--@click="handleImport"-->
+          <!--v-hasPermi="['pssr:frame:edit']"-->
+          <!--v-if="isApprove==0"-->
+        <!--&gt;导入-->
+        <!--</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

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

@@ -61,16 +61,16 @@
           v-if="isApprove==0"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:franklinism:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
-        </el-col>
+        <!--<el-col :span="1.5">-->
+            <!--<el-button-->
+                    <!--type="info"-->
+                    <!--icon="el-icon-upload2"-->
+                    <!--size="mini"-->
+                    <!--@click="handleImport"-->
+                    <!--v-hasPermi="['pssr:franklinism:edit']"-->
+                    <!--v-if="isApprove==0"-->
+            <!--&gt;导入</el-button>-->
+        <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

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

@@ -70,16 +70,16 @@
           v-if="isApprove==0"
         >删除</el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:hygiene:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
-        </el-col>
+        <!--<el-col :span="1.5">-->
+            <!--<el-button-->
+                    <!--type="info"-->
+                    <!--icon="el-icon-upload2"-->
+                    <!--size="mini"-->
+                    <!--@click="handleImport"-->
+                    <!--v-hasPermi="['pssr:hygiene:edit']"-->
+                    <!--v-if="isApprove==0"-->
+            <!--&gt;导入</el-button>-->
+        <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"

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

@@ -64,17 +64,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['pssr:protection:edit']"
-          v-if="isApprove==0"
-        >导入
-        </el-button>
-      </el-col>
+      <!--<el-col :span="1.5">-->
+        <!--<el-button-->
+          <!--type="info"-->
+          <!--icon="el-icon-upload2"-->
+          <!--size="mini"-->
+          <!--@click="handleImport"-->
+          <!--v-hasPermi="['pssr:protection:edit']"-->
+          <!--v-if="isApprove==0"-->
+        <!--&gt;导入-->
+        <!--</el-button>-->
+      <!--</el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"