Procházet zdrojové kódy

优化房屋导入 格式问题

java110 před 4 roky
rodič
revize
8c8eeeaef8

+ 8 - 8
java110-interface/src/main/resources/logback-prod.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds">
 
-<!--    <include resource="org/springframework/boot/logging/logback/base.xml"/>-->
+    <include resource="org/springframework/boot/logging/logback/base.xml"/>
 
     <!-- 控制台输出 -->
     <appender name="STDOUT_FILE" class="ch.qos.logback.core.ConsoleAppender">
@@ -64,7 +64,7 @@
     <logger name="org.springframework" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="com.java110.api" level="ERROR">
+    <logger name="com.java110.api" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
     <logger name="com.java110.order" level="ERROR">
@@ -72,26 +72,26 @@
     </logger>
 
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="ERROR">
+    <logger name="com.apache.ibatis" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="org.mybatis" level="ERROR">
+    <logger name="org.mybatis" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.Statement" level="ERROR">
+    <logger name="druid.sql.Statement" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.ResultSet" level="ERROR">
+    <logger name="druid.sql.ResultSet" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
 
-    <logger name="com.java110" level="ERROR">
+    <logger name="com.java110" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="io.shardingsphere" level="ERROR">
+    <logger name="io.shardingsphere" level="DEBUG">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 

+ 8 - 8
java110-interface/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds">
 
-    <include resource="org/springframework/boot/logging/logback/base.xml"/>
+<!--    <include resource="org/springframework/boot/logging/logback/base.xml"/>-->
 
     <!-- 控制台输出 -->
     <appender name="STDOUT_FILE" class="ch.qos.logback.core.ConsoleAppender">
@@ -64,7 +64,7 @@
     <logger name="org.springframework" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="com.java110.api" level="DEBUG">
+    <logger name="com.java110.api" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
     <logger name="com.java110.order" level="ERROR">
@@ -72,26 +72,26 @@
     </logger>
 
     <!--myibatis log configure-->
-    <logger name="com.apache.ibatis" level="DEBUG">
+    <logger name="com.apache.ibatis" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="org.mybatis" level="DEBUG">
+    <logger name="org.mybatis" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.Statement" level="DEBUG">
+    <logger name="druid.sql.Statement" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
-    <logger name="druid.sql.ResultSet" level="DEBUG">
+    <logger name="druid.sql.ResultSet" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
 
-    <logger name="com.java110" level="DEBUG">
+    <logger name="com.java110" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 
-    <logger name="io.shardingsphere" level="DEBUG">
+    <logger name="io.shardingsphere" level="ERROR">
         <appender-ref ref="STDOUT_FILE"/>
     </logger>
 

+ 2 - 1
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -1189,7 +1189,8 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
 
                 if (os.length > 6 && !StringUtil.isNullOrNone(os[6])) {
                     importRoom.setRoomFeeId(os[7].toString());
-                    importRoom.setFeeEndDate(os[8].toString());
+                    String feeEndDate = excelDoubleToDate(os[8].toString());
+                    importRoom.setFeeEndDate(feeEndDate);
                 }
                 if (os.length < 7 || StringUtil.isNullOrNone(os[6])) {
                     rooms.add(importRoom);