From b63f41b8a0cfce68770e5cb02c8dd3fd994f0c59 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期二, 22 七月 2025 18:37:54 +0800
Subject: [PATCH] 修改费用导入模块2025/07/22

---
 java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java b/java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java
index 8d1ebc8..ad26474 100755
--- a/java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/Java110StringConvert.java
@@ -45,19 +45,23 @@
     }
 
     @Override
-    protected Object convertToType(Class type, Object value) throws Throwable {
+    protected <T> T convertToType(Class<T> type, Object value) throws Throwable {
         //System.out.printf("12313");
         logger.debug("convertToType褰撳墠瀵硅薄绫诲瀷start" + value.getClass());
 
-        if (value instanceof Date) {
-            return DateUtil.getFormatTimeString((Date) value, DateUtil.DATE_FORMATE_STRING_A);
+        if(type.getClass().equals(String.class)) {
+	        if (value instanceof Date) {
+	            return type.cast(DateUtil.getFormatTimeString(Date.class.cast(value), DateUtil.DATE_FORMATE_STRING_A));
+	        }
+	        logger.debug("convertToType褰撳墠瀵硅薄绫诲瀷" + value.getClass());
+	        return type.cast(value.toString());
+        }else {
+        	return null;
         }
-        logger.debug("convertToType褰撳墠瀵硅薄绫诲瀷" + value.getClass());
-        return value.toString();
     }
 
     @Override
-    protected Class getDefaultType() {
+    protected Class<?> getDefaultType() {
         return String.class;
     }
 }

--
Gitblit v1.8.0