hj

calc_result/RiskComputer.py

@@ -46,21 +46,34 @@ class RiskComputer:
                     ret = "—"
                 a=indexItem.Name
                 if(a not in self.IndexRes1):
+                    if ret == "—":
+                        ret = "—"
+                    else:
+                        ret = format(ret, ',')  # 指定逗号位数字的千分位分隔符
                     self.IndexRes1[a]={Curr_Date:ret}
                 else:
+                    if(Previous_Date not in self.IndexRes1[a]):
+                        if ret == "—":
+                            ret = "—"
+                        else:
+                            ret = format(ret, ',')  # 指定逗号位数字的千分位分隔符
+                        self.IndexRes1[a][Previous_Date]=ret
+                    else:
                         if ret == 0:
                             ret = str(ret)
                         elif ret == '—':
                             ret = '—'
                         else:
+                            print(type(ret),"====ret")
                             ret1 = float('%.2f' % ret)
                             ret = str(ret1 * 100) + '%'
                         self.IndexRes1[a]["change_rate"] = ret
+
     def Ret2Json(self):#把指标结果转化为樊辉需要的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")
-        cursor = db.cursor()  
+        cursor = db.cursor()
         arr = [self.IndexRes,self.IndexRes1]
         ss = ['ri','fi']
         for i,index_results in enumerate(arr): #索引，值
@@ -68,7 +81,7 @@ class RiskComputer:
             print(index_results, "=============qq")
             for key in index_results:
                 # print(self.indexs['id'],"=======公式id")
-                #'factors_name':'指标状态'
+                #'factors_name':'指标状态47.105.186.2'
                 ri1 = {}
                 ri1[key]= index_results[key]
                 insert_batch_No = "'"+str(self.batch_No)+"'"
@@ -82,7 +95,6 @@ class RiskComputer:
                     insert_key = str(key)
                 insert_status = str(index_results[key])
                 sql='INSERT INTO result_set(Batchno,indexName,status,biztype) VALUES (%s,"%s","%s","%s")'%(insert_batch_No,insert_key,insert_status,ss[i])
-                # print(sql,"======风控sql")
                 try:
                     cursor.execute(sql)
                 # 提交到数据库执行