PSSR导入功能修改

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

@@ -122,8 +122,6 @@ public class TPssrOverhaulTowerController extends BaseController {
                         entity.setWorkDes(cellValue);
                     } else if (j == 3) {
                         entity.setPidNo(cellValue);
-                    } else if (j == 4) {
-                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());

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

@@ -121,16 +121,6 @@ public class TPssrPumpCleaningController extends BaseController {
                         entity.setPosition(cellValue);
                     } else if (j == 2) {
                         entity.setFilterNumber(cellValue);
-                    } else if (j == 3) {
-                        entity.setCleaning(cellValue);
-                    } else if (j == 4) {
-                        entity.setBackLoading(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/TPssrPumpFillController.java

@@ -121,18 +121,6 @@ public class TPssrPumpFillController extends BaseController {
                         entity.setDevNo(cellValue);
                     } else if (j == 2) {
                         entity.setLubricatingPart(cellValue);
-                    } else if (j == 3) {
-                        entity.setFillingComplete(cellValue);
-                    } else if (j == 4) {
-                        entity.setLubricatingLeak(cellValue);
-                    } else if (j == 5) {
-                        entity.setLiquidNormal(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/TPssrPumpOverhaulController.java

@@ -119,16 +119,6 @@ public class TPssrPumpOverhaulController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
-                    } else if (j == 2) {
-                        entity.setBackLoading(cellValue);
-                    } else if (j == 3) {
-                        entity.setOverhaulDone(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/overhaulValve/index.vue

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