feat(shipping): 增加通过发货单号查询发货审批详情接口

zss

5 天以前 a8d514292f781af37e95d08cd6edbcbeec20aa74

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

@@ -465,21 +465,37 @@
                    {

                        val = Convert.toBigDecimal(val);

                    }

                    else if (Date.class == fieldType)

                    {

                        if (val instanceof String)

                        {

                            val = DateUtils.parseDate(val);

                    else if (Date.class == fieldType)
                    {
                        if (val instanceof String)
                        {
                            val = DateUtils.parseDate(val);
                        }

                        else if (val instanceof Double)

                        {

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

                        }

                    }

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

                    {

                        val = Convert.toBool(val, false);

                    }

                        {
                            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);
                    }
                    if (StringUtils.isNotNull(fieldType))

                    {

                        String propertyName = field.getName();

@@ -651,15 +667,24 @@
                        val = Convert.toFloat(val);

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

                        val = Convert.toBigDecimal(val);

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

                        if (val instanceof String) {

                            val = DateUtils.parseDate(val);

                        } else if (val instanceof Double) {

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

                        }

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

                        val = Convert.toBool(val, false);

                    }

                    } else if (Date.class == fieldType) {
                        if (val instanceof String) {
                            val = DateUtils.parseDate(val);
                        } 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);
                    }


                    if (StringUtils.isNotNull(fieldType)) {

                        String propertyName = field.getName();