浏览代码

修复批量导入BUG

lin 4 年之前
父节点
当前提交
56016df5a7

+ 11 - 11
meter-reading-common/src/main/resources/mapper/CustomerMapper.xml

@@ -280,17 +280,17 @@
 
   <select id="getSubId" resultType="java.lang.Integer">
     SELECT  DATA.id FROM(
-                                SELECT
-                                        @ids as _ids,
-                                        (   SELECT @ids := GROUP_CONCAT(id)
-                                            FROM sc_customer
-                                            WHERE FIND_IN_SET(parent_id, @ids)
-                                                ) as cids,
-                                        @l := @l+1 as level
-                                FROM sc_customer,
-                                     (SELECT @ids :=#{customerId}, @l := 0 ) b
-                                WHERE @ids IS NOT NULL
-                                ) id, sc_customer DATA
+      SELECT
+              @ids as _ids,
+              (   SELECT @ids := GROUP_CONCAT(id)
+                  FROM sc_customer
+                  WHERE FIND_IN_SET(parent_id, @ids)
+                      ) as cids,
+              @l := @l+1 as level
+      FROM sc_customer,
+           (SELECT @ids :=#{customerId}, @l := 0 ) b
+      WHERE @ids IS NOT NULL
+      ) id, sc_customer DATA
     WHERE FIND_IN_SET(DATA.id, ID._ids)
   </select>
 </mapper>

+ 3 - 0
smart-city-platform/src/main/java/com/bz/smart_city/excel/AbstractResolverExcelTemplate.java

@@ -12,6 +12,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
 import java.io.FileInputStream;
@@ -25,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 @Slf4j
 @Component
+@Scope("prototype")
 public abstract class AbstractResolverExcelTemplate {
 
     @Value("${files.path}")
@@ -118,6 +120,7 @@ public abstract class AbstractResolverExcelTemplate {
                 os.close();
                 record.setFailFilePath(FailFilePath);
             }catch (Exception e){
+                log.error("failFile error = {} {}" , e.getMessage(), JSON.toJSON(e));
                 e.printStackTrace();
             }