pyxllib 0.3.135__tar.gz → 0.3.136__tar.gz

{pyxllib-0.3.135/pyxllib.egg-info → pyxllib-0.3.136}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.135
+Version: 0.3.136
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -42,29 +42,29 @@ Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
 Requires-Dist: pillow; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: pynvml; extra == "xlai"
-Requires-Dist: opsdroid-get-image-size; extra == "xlai"
-Requires-Dist: opencv-python; extra == "xlai"
 Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
+Requires-Dist: opencv-python; extra == "xlai"
+Requires-Dist: opsdroid-get-image-size; extra == "xlai"
+Requires-Dist: pynvml; extra == "xlai"
 Provides-Extra: xlall
-Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: flask; extra == "xlall"
 Requires-Dist: flask-wtf; extra == "xlall"
-Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
+Requires-Dist: pillow; extra == "xlall"
 Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
 Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
 Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: flask; extra == "xlall"
 Requires-Dist: openai2; extra == "xlall"
+Requires-Dist: fastapi; extra == "xlall"
 Requires-Dist: opencv-python; extra == "xlall"
-Requires-Dist: pillow; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
 Requires-Dist: zhconv; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: ujson; extra == "xlall"
+Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.135 → pyxllib-0.3.136}/pyxllib/ext/kq5034lib.py

@@ -850,13 +850,44 @@ class 网课考勤:
             df = df.drop(items.index)
 
         # 3 匹配完后，还有目标金额的数据要列出来
+        
+        # items = df[df['收支金额(元)'] == f'`{value:.2f}']
+        # # todo 这个要识别到'交易单号'中间的日期，降序排序
+        # for idx, row in items.iterrows():
+        #     last_row += 1
+        #     ws.cell2(last_row, '交易单号').value = row['微信支付业务单号']
+        #     ws.cell2(last_row, '交易订单号').value = row['业务凭证号'][1:]
+        #     ws.cell2(last_row, '订单金额').value = row['收支金额(元)']
+
+        # todo：新增测试用：
+        # 初始化一个空的 DataFrame，用于存储遍历结果
+        result_df = pd.DataFrame(columns=['微信支付业务单号', '业务凭证号', '收支金额'])
+        # 遍历符合条件的数据并存储到 result_df 中
         items = df[df['收支金额(元)'] == f'`{value:.2f}']
-        # todo 这个要识别到'交易单号'中间的日期，降序排序
         for idx, row in items.iterrows():
+            # 将 row 中的数据添加到 result_df 中
+            result_df = pd.concat([
+                result_df,
+                pd.DataFrame({
+                    '微信支付业务单号': [row['微信支付业务单号']],
+                    '业务凭证号': [row['业务凭证号'][1:]],  # 去掉业务凭证号的第一个字符
+                    '收支金额': [row['收支金额(元)']]
+                })
+            ], ignore_index=True)
+
+        # 提取日期部分，并将其转为可排序的格式
+        result_df['日期'] = result_df['微信支付业务单号'].str[11:19]  # 提取日期部分，假设日期位于固定位置
+        result_df['日期'] = pd.to_datetime(result_df['日期'], format='%Y%m%d')
+
+        # 按日期降序排序
+        result_df = result_df.sort_values(by='日期', ascending=False).drop(columns=['日期'])
+
+        # 将排序后的 DataFrame 写入到工作表中
+        for idx, row in result_df.iterrows():
             last_row += 1
             ws.cell2(last_row, '交易单号').value = row['微信支付业务单号']
-            ws.cell2(last_row, '交易订单号').value = row['业务凭证号'][1:]
-            ws.cell2(last_row, '订单金额').value = row['收支金额(元)']
+            ws.cell2(last_row, '交易订单号').value = row['业务凭证号']
+            ws.cell2(last_row, '订单金额').value = row['收支金额']
 
         # 4 保存
         self.wb.save(self.表格路径)

{pyxllib-0.3.135 → pyxllib-0.3.136/pyxllib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxllib
-Version: 0.3.135
+Version: 0.3.136
 Summary: 厦门理工模式识别团队通用python代码工具库
 Home-page: https://github.com/XLPRUtils/pyxllib
 Author: code4101
@@ -42,29 +42,29 @@ Requires-Dist: opsdroid-get-image-size; extra == "xlcv"
 Requires-Dist: opencv-python; extra == "xlcv"
 Requires-Dist: pillow; extra == "xlcv"
 Provides-Extra: xlai
-Requires-Dist: pynvml; extra == "xlai"
-Requires-Dist: opsdroid-get-image-size; extra == "xlai"
-Requires-Dist: opencv-python; extra == "xlai"
 Requires-Dist: pillow; extra == "xlai"
 Requires-Dist: visdom; extra == "xlai"
+Requires-Dist: opencv-python; extra == "xlai"
+Requires-Dist: opsdroid-get-image-size; extra == "xlai"
+Requires-Dist: pynvml; extra == "xlai"
 Provides-Extra: xlall
-Requires-Dist: sentencepiece; extra == "xlall"
+Requires-Dist: flask; extra == "xlall"
 Requires-Dist: flask-wtf; extra == "xlall"
-Requires-Dist: ujson; extra == "xlall"
-Requires-Dist: uvicorn; extra == "xlall"
-Requires-Dist: arts; extra == "xlall"
+Requires-Dist: pillow; extra == "xlall"
 Requires-Dist: flask-jwt-extended; extra == "xlall"
-Requires-Dist: fastapi; extra == "xlall"
-Requires-Dist: opsdroid-get-image-size; extra == "xlall"
-Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: arts; extra == "xlall"
 Requires-Dist: flask-cors; extra == "xlall"
+Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: sentencepiece; extra == "xlall"
 Requires-Dist: html2text; extra == "xlall"
-Requires-Dist: flask; extra == "xlall"
 Requires-Dist: openai2; extra == "xlall"
+Requires-Dist: fastapi; extra == "xlall"
 Requires-Dist: opencv-python; extra == "xlall"
-Requires-Dist: pillow; extra == "xlall"
+Requires-Dist: opsdroid-get-image-size; extra == "xlall"
 Requires-Dist: zhconv; extra == "xlall"
-Requires-Dist: xlrd; extra == "xlall"
+Requires-Dist: ujson; extra == "xlall"
+Requires-Dist: flask-restful; extra == "xlall"
+Requires-Dist: uvicorn; extra == "xlall"
 
 # 1 install
 

{pyxllib-0.3.135 → pyxllib-0.3.136}/setup.py

@@ -50,7 +50,7 @@ _dir = Path(__file__).parent
 
 setup(
     name='pyxllib',  # pip 安装时用的名字
-    version='0.3.135',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
+    version='0.3.136',  # 当前版本，每次更新上传到pypi都需要修改; 第4位版本号一般是修紧急bug
     author='code4101',
     author_email='877362867@qq.com',
     url='https://github.com/XLPRUtils/pyxllib',

{pyxllib-0.3.135 → pyxllib-0.3.136}/pyxllib.egg-info/requires.txt

@@ -23,30 +23,30 @@ pandas>=0.23.4
 pillow
 
 [xlai]
-pynvml
-opsdroid-get-image-size
-opencv-python
 pillow
 visdom
+opencv-python
+opsdroid-get-image-size
+pynvml
 
 [xlall]
-sentencepiece
+flask
 flask-wtf
-ujson
-uvicorn
-arts
+pillow
 flask-jwt-extended
-fastapi
-opsdroid-get-image-size
-flask-restful
+arts
 flask-cors
+xlrd
+sentencepiece
 html2text
-flask
 openai2
+fastapi
 opencv-python
-pillow
+opsdroid-get-image-size
 zhconv
-xlrd
+ujson
+flask-restful
+uvicorn
 
 [xlcv]
 opsdroid-get-image-size