educode_sales 1.10.5 → 1.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2e7e3e78774b085c64185fddc9b8ecddbcbb7bf87e030c8f449fb21285f8c9
-  data.tar.gz: c1ea147b8d76cc8ef23d6004834d4c79499b2c1d7f18c233e939f030b303488f
+  metadata.gz: ac101917e54365aede7a60619e9caf0be8de80ed94145e3abd9449a710444235
+  data.tar.gz: f78e765716fe9842703fbc8a66c9f7bd589843c940304da3b3ae65ac4f67db28
 SHA512:
-  metadata.gz: 37e8d9e9ce8bbf78632588b9bff325548e3004dbb2a8daf7b3a64a29fd547556c41bc0ecfc3b244fb8725e2cd76cb3618cc08db4952a47189f8f0dfb1f19943e
-  data.tar.gz: a5661dcb147e98afe980d0c330c9d8fcb5f297335ec2f305e658b3f088be9c57919f7e534241d6d7b612dc903043190aa9b9132dd6a727122299e7dd847071c5
+  metadata.gz: a96c916670d4f3e696c00378e5f94934ef9ea294968deac363f2ea0a043235d6215fd466729a9084ad6cd2899a583f111433f3cdef3cbc055c10e18640d8d61b
+  data.tar.gz: 4d3db639eb7d38180600e00a565502f71dfd19803abe213cb657edcc9b4bf2e7869399049edd5592e07856d15fda1b1a7d9b214147555a5cd4fb19dbf9040039

data/app/controllers/educode_sales/assessments_controller.rb

@@ -437,14 +437,8 @@ module EducodeSales
     #导入签到记录接口
     def import_attendances
       render_failure("文件不存在或格式错误") if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
-      Rails.logger.info "导入签到数据"
-      begin
-        doc = SimpleXlsxReader.open(params[:file])
-      rescue
-        return render_error("文件不存在或格式错误")
-      end
+      doc = SimpleXlsxReader.open(params[:file].to_io)
       size = doc.sheets.size
-      Rails.logger.info size
       attendance_attrs = %i[name attendance_date longitude latitude location address mobile_id ip_address customer target created_at updated_at]
       attendance_vales = []
       (0..size - 1).each do |index|
@@ -456,23 +450,23 @@ module EducodeSales
           longitude = d[3]
           latitude = d[4]
           location = d[5]
-              address = d[6]
-              mobile_id = d[7]
-              ip_address = d[8]
-              customer = d[9]
-              target = d[10]
-              attendance_vales << {name: name, attendance_date: attendance_date, longitude: longitude, latitude: latitude, location: location,
-                                   address: address, mobile_id: mobile_id, ip_address: ip_address, customer: customer, target: target}
+          address = d[6]
+          mobile_id = d[7]
+          ip_address = d[8]
+          customer = d[9]
+          target = d[10]
+          attendance_vales << {name: name, attendance_date: attendance_date, longitude: longitude, latitude: latitude, location: location,
+                               address: address, mobile_id: mobile_id, ip_address: ip_address, customer: customer, target: target}
 
-            end
-          end
-          EducodeSales::Attendance.bulk_insert(*attendance_attrs) do |worker|
-            attendance_vales.each do |attendance|
-              worker.add(name: attendance[:name], attendance_date: attendance[:attendance_date].to_datetime, longitude: attendance[:longitude], latitude: attendance[:latitude],
-                         location: attendance[:location], address: attendance[:address], mobile_id: attendance[:mobile_id], ip_address: attendance[:ip_address], customer: attendance[:customer], target: attendance[:target])
-            end
-          end
-          render_success
+        end
+      end
+      EducodeSales::Attendance.bulk_insert(*attendance_attrs) do |worker|
+        attendance_vales.each do |attendance|
+          worker.add(name: attendance[:name], attendance_date: attendance[:attendance_date].to_datetime, longitude: attendance[:longitude], latitude: attendance[:latitude],
+                     location: attendance[:location], address: attendance[:address], mobile_id: attendance[:mobile_id], ip_address: attendance[:ip_address], customer: attendance[:customer], target: attendance[:target])
+        end
+      end
+      render_success
     end
 
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.5'
+  VERSION = '1.10.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.5
+  version: 1.10.7
 platform: ruby
 authors:
 - anke1460