hj

calc_result/IndexComputerFile.py

@@ -93,7 +93,7 @@ class IndexComputer:
                     print("计算异常公式时")
                     print("计算异常公式时")
                     print('finance error:', err)
                     print('finance error:', err)
                     return "∞"
                     return "∞"
-                Finance_result = int(X[j - 1])
+                Finance_result = X[j - 1]
                 if Finance_result ==0.0:
                 if Finance_result ==0.0:
                     Finance_result= int(Finance_result)
                     Finance_result= int(Finance_result)
                 else:
                 else:

calc_result/RiskComputer.py

@@ -49,14 +49,22 @@ class RiskComputer:
                     if ret == "—":
                     if ret == "—":
                         ret = "—"
                         ret = "—"
                     else:
                     else:
-                        ret = format(ret, ',')  # 指定逗号位数字的千分位分隔符
+                        if "率" in a:
+                            ret1 = float('%.2f' % ret)
+                            ret = str(float('%.2f' % (ret1*100))) + '%'
+                        else:
+                            ret = format(ret, ',')  # 指定逗号位数字的千分位分隔符
                     self.IndexRes1[a]={Curr_Date:ret}
                     self.IndexRes1[a]={Curr_Date:ret}
                 else:
                 else:
                     if(Previous_Date not in self.IndexRes1[a]):
                     if(Previous_Date not in self.IndexRes1[a]):
                         if ret == "—":
                         if ret == "—":
                             ret = "—"
                             ret = "—"
                         else:
                         else:
-                            ret = format(ret, ',')  # 指定逗号位数字的千分位分隔符
+                            if "率" in a:
+                                ret1 = float('%.2f' % ret)
+                                ret = str(float('%.2f' % (ret1*100))) + '%'
+                            else:
+                                ret = format(ret, ',')  # 指定逗号位数字的千分位分隔符
                         self.IndexRes1[a][Previous_Date]=ret
                         self.IndexRes1[a][Previous_Date]=ret
                     else:
                     else:
                         if ret == 0:
                         if ret == 0:
@@ -64,24 +72,18 @@ class RiskComputer:
                         elif ret == '—':
                         elif ret == '—':
                             ret = '—'
                             ret = '—'
                         else:
                         else:
-                            print(type(ret),"====ret")
                             ret1 = float('%.2f' % ret)
                             ret1 = float('%.2f' % ret)
-                            ret = str(ret1 * 100) + '%'
+                            ret = str(float('%.2f' % (ret1*100))) + '%'
                         self.IndexRes1[a]["change_rate"] = ret
                         self.IndexRes1[a]["change_rate"] = ret
 
 
     def Ret2Json(self):#把指标结果转化为樊辉需要的Json
     def Ret2Json(self):#把指标结果转化为樊辉需要的Json
         #json写入数据库
         #json写入数据库
-        # db = pymysql.connect(host='47.105.186.2',port=3307,user='caishui',password='jvmfTVDuG5YE(*Z',db='fktaxctl',charset="utf8mb4")
         db = pymysql.connect(host=FK_DB_HOST,port=int(FK_DB_PORT),user=FK_DB_USER,password=FK_DB_PWD,db=FK_DB_NAME,charset="utf8mb4")
         db = pymysql.connect(host=FK_DB_HOST,port=int(FK_DB_PORT),user=FK_DB_USER,password=FK_DB_PWD,db=FK_DB_NAME,charset="utf8mb4")
         cursor = db.cursor()
         cursor = db.cursor()
         arr = [self.IndexRes,self.IndexRes1]
         arr = [self.IndexRes,self.IndexRes1]
         ss = ['ri','fi']
         ss = ['ri','fi']
         for i,index_results in enumerate(arr): #索引，值
         for i,index_results in enumerate(arr): #索引，值
-            print(i,"=============i")
-            print(index_results, "=============qq")
             for key in index_results:
             for key in index_results:
-                # print(self.indexs['id'],"=======公式id")
-                #'factors_name':'指标状态47.105.186.2'
                 ri1 = {}
                 ri1 = {}
                 ri1[key]= index_results[key]
                 ri1[key]= index_results[key]
                 insert_batch_No = "'"+str(self.batch_No)+"'"
                 insert_batch_No = "'"+str(self.batch_No)+"'"
@@ -100,7 +102,7 @@ class RiskComputer:
                 # 提交到数据库执行
                 # 提交到数据库执行
                     db.commit()
                     db.commit()
                 except Exception as e:
                 except Exception as e:
-                    print(e)
+                    # print(e)
                     db.rollback()
                     db.rollback()
             # 关闭数据库连接
             # 关闭数据库连接
         db.close()
         db.close()