Ver Fonte

bug fix: MOC带压堵漏清单卡具状态和移除时间导入失败问题

wangggziwen há 2 anos atrás
pai
commit
1518f3fc14

+ 4 - 6
master/src/main/java/com/ruoyi/project/process/controller/TMocController.java

@@ -230,20 +230,18 @@ public class TMocController extends BaseController
                         if (cellValue.length() > 3) {
                             entity.setExtention9(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 21) {
-                        if (cellValue.length() > 3) {
-                            entity.setExpTime(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                        }
-                    } else if (j == 22) {
+                    }else if (j == 21) {
                         for (SysDictData sysDictData : mocStatusDict) {
                             if (sysDictData.getDictLabel().equals(cellValue.trim())) {
                                 entity.setStatus(sysDictData.getDictValue());
                             }
                         }
-                    } else if (j == 23) {
+                    } else if (j == 22) {
                         if (cellValue.length() > 3) {
                             entity.setRemoveTime(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
+                    } else if (j == 23) {
+                        entity.setRemarks(cellValue);
                     }
                 }
                 entity.setCreaterCode(userId.toString());