d

fi-taxctl/app/base/service/impl/rpt/rpttypeSve.js

@@ -59,14 +59,10 @@ class RptTypeService extends ServiceBase{
               
               
           }));
           }));
           console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>sended...........");
           console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>sended...........");
-          await self.redisClient.delete("batch"+batchid);
+          self.redisClient.delete("batch"+batchid);
           //改变批的状态为解析完毕
           //改变批的状态为解析完毕
           batch.batchstatuscode="calc";
           batch.batchstatuscode="calc";
-<<<<<<< HEAD
-          await batch.save({transaction:t});
-=======
-          await batch.save();
->>>>>>> 422cb0a3bd4d59bfb998fa20ae4441a4e83c6e35
+          batch.save({transaction:t});
         }
         }
         return {};
         return {};
     });
     });