feat: 设备台账启用状态、审批签核展示与导入健壮性

gaoluyang

17 小时以前 9cd4074a456fd5c422506279191b6015836347e5

 src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -476,6 +476,22 @@
                            val = DateUtil.getJavaDate((Double) val);

                        }

                    }

                    else if (LocalDate.class == fieldType)

                    {

                        if (val instanceof String)

                        {

                            Date date = DateUtils.parseDate(val);

                            val = StringUtils.isNull(date) ? null : DateUtils.toLocalDate(date);

                        }

                        else if (val instanceof Date)

                        {

                            val = DateUtils.toLocalDate((Date) val);

                        }

                        else if (val instanceof Double)

                        {

                            val = DateUtils.toLocalDate(DateUtil.getJavaDate((Double) val));

                        }

                    }

                    else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)

                    {

                        val = Convert.toBool(val, false);

@@ -519,7 +535,11 @@
                        ReflectUtils.invokeSetter(entity, propertyName, val);

                    }

                }

                list.add(entity);

                // 表头与模板不一致时这一行可能没有匹配到任何字段，entity 为 null，跳过以免调用方空指针

                if (entity != null)

                {

                    list.add(entity);

                }

            }

        }

        return list;

@@ -657,6 +677,15 @@
                        } else if (val instanceof Double) {

                            val = DateUtil.getJavaDate((Double) val);

                        }

                    } else if (LocalDate.class == fieldType) {

                        if (val instanceof String) {

                            Date date = DateUtils.parseDate(val);

                            val = StringUtils.isNull(date) ? null : DateUtils.toLocalDate(date);

                        } else if (val instanceof Date) {

                            val = DateUtils.toLocalDate((Date) val);

                        } else if (val instanceof Double) {

                            val = DateUtils.toLocalDate(DateUtil.getJavaDate((Double) val));

                        }

                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {

                        val = Convert.toBool(val, false);

                    }

@@ -689,7 +718,11 @@
                        ReflectUtils.invokeSetter(entity, propertyName, val);

                    }

                }

                list.add(entity);

                // 表头与模板不一致时这一行可能没有匹配到任何字段，entity 为 null，跳过以免调用方空指针

                if (entity != null)

                {

                    list.add(entity);

                }

            }

        }

        return list;