|  | @@ -388,7 +388,7 @@ class TongCe:
 | 
	
		
			
				|  |  |          self.shangju_db = MysqlDB('shangju')
 | 
	
		
			
				|  |  |          self.marketing_db = MysqlDB('bi_report')
 | 
	
		
			
				|  |  |          self.linshi_db = MysqlDB('linshi', db_type=1)
 | 
	
		
			
				|  |  | -        self.options_info = ExcelUtil('工作表6', 'tongce.xlsx').read_options_info()
 | 
	
		
			
				|  |  | +        self.options_info = ExcelUtil('工作表6', 'tongce1.xlsx').read_options_info()
 | 
	
		
			
				|  |  |          self.table_type_info = ExcelUtil('新增项目数据项类型排序与展示图表类型管理表', 'table_type.xlsx').get_table_type_info()
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      def close(self):
 | 
	
	
		
			
				|  | @@ -527,18 +527,18 @@ class TongCe:
 | 
	
		
			
				|  |  |                              no_data_case.append([zhifuli, city, age, juzhujiegou, key])
 | 
	
		
			
				|  |  |                  count += len(insert_data)
 | 
	
		
			
				|  |  |                  self.linshi_db.add_some(self.sql_6, insert_data)
 | 
	
		
			
				|  |  | -            isnert_data_all = []
 | 
	
		
			
				|  |  | -            quanliang_scores = self.scores()
 | 
	
		
			
				|  |  | -            for q_s in quanliang_scores:
 | 
	
		
			
				|  |  | -                rule_id = self.get_rule_id(q_s[0], rule)
 | 
	
		
			
				|  |  | -                if rule_id:
 | 
	
		
			
				|  |  | -                    for md in self.match_data_info:
 | 
	
		
			
				|  |  | -                        if str(md[1]) == str(q_s[0]) and str(md[2]) == str(q_s[1]):
 | 
	
		
			
				|  |  | -                            match_id = md[0]
 | 
	
		
			
				|  |  | -                            option_name_alias = md[3]
 | 
	
		
			
				|  |  | -                            isnert_data_all.append([5405, match_id, rule_id, option_name_alias, q_s[2]])
 | 
	
		
			
				|  |  | -            self.linshi_db.add_some(self.sql_6, isnert_data_all)
 | 
	
		
			
				|  |  | -            count += len(isnert_data_all)
 | 
	
		
			
				|  |  | +            # isnert_data_all = []
 | 
	
		
			
				|  |  | +            # quanliang_scores = self.scores()
 | 
	
		
			
				|  |  | +            # for q_s in quanliang_scores:
 | 
	
		
			
				|  |  | +            #     rule_id = self.get_rule_id(q_s[0], rule)
 | 
	
		
			
				|  |  | +            #     if rule_id:
 | 
	
		
			
				|  |  | +            #         for md in self.match_data_info:
 | 
	
		
			
				|  |  | +            #             if str(md[1]) == str(q_s[0]) and str(md[2]) == str(q_s[1]):
 | 
	
		
			
				|  |  | +            #                 match_id = md[0]
 | 
	
		
			
				|  |  | +            #                 option_name_alias = md[3]
 | 
	
		
			
				|  |  | +            #                 isnert_data_all.append([5405, match_id, rule_id, option_name_alias, q_s[2]])
 | 
	
		
			
				|  |  | +            # self.linshi_db.add_some(self.sql_6, isnert_data_all)
 | 
	
		
			
				|  |  | +            # count += len(isnert_data_all)
 | 
	
		
			
				|  |  |              return {'写入库中的数据': count, '无数据': len(no_data_case)}
 | 
	
		
			
				|  |  |          except Exception as e:
 | 
	
		
			
				|  |  |              return str(e)
 |