educode_sales 1.10.6 → 1.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 138761e29a054edfe513ee47574a20a739ca870ff0e3e6b782fc56f223aa687f
-  data.tar.gz: 0d20d394776e51dbeb4951d3bcb4f65d34ffca723652030ffd4029e6f627843f
+  metadata.gz: ac101917e54365aede7a60619e9caf0be8de80ed94145e3abd9449a710444235
+  data.tar.gz: f78e765716fe9842703fbc8a66c9f7bd589843c940304da3b3ae65ac4f67db28
 SHA512:
-  metadata.gz: ea3c74b8b148f37fe9c623ec9e54edb4c7bc8bfdebe2db06e3c786342931907ba87284a0c09d7d9c2bc5e0b17f3f69f7fc36301c4cc97a6ee5d2b6a1a1adb028
-  data.tar.gz: 3afa2866dd5e880647952a5b5c2386145b7633a228bca49363b38c226216035ebf6033961b273912aa80144c8bc68344f0414a89260b88f20cc148e2dcda93cc
+  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_failure("文件不存在或格式错误")
-      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.6'
+  VERSION = '1.10.7'
 end

data/lib/educode_sales.rb

@@ -1,6 +1,5 @@
 require "educode_sales/engine"
 require 'cancancan'
-require 'simple_xlsx_reader'
 module EducodeSales
   # Your code goes here...
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.6
+  version: 1.10.7
 platform: ruby
 authors:
 - anke1460
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: simple_xlsx_reader
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement