renyupeng 3 年之前
父节点
当前提交
6c6ec56d4e
共有 1 个文件被更改,包括 12 次插入3 次删除
  1. 12 3
      Apietl/utlis/Utils.py

+ 12 - 3
Apietl/utlis/Utils.py

@@ -8,6 +8,7 @@
 import argparse
 import datetime
 from datetime import timedelta, date
+from  datetime import datetime as dt
 import calendar
 
 
@@ -41,7 +42,10 @@ class Utils:
         if start_date is None:
             start_date = date.today().replace(day=1)
             _, days_in_month = calendar.monthrange(start_date.year, start_date.month)
-        end_date = start_date + timedelta(days=days_in_month)
+        if start_date.day == 1:
+            end_date = start_date
+        else:
+            end_date = start_date + timedelta(days=days_in_month)
         return start_date, end_date
 
     @staticmethod
@@ -50,12 +54,17 @@ class Utils:
         ll = []
         day = timedelta(days=1)
         startday, endday = Utils.get_month_range()
-        print(str(startday))
+        if startday == endday:
+            mon = (datetime.date.today() + datetime.timedelta(-1)).strftime("%m")
+            startday = """{year}-{month}-01""".format(year=startday.year, month=mon)
+            startday = datetime.datetime.date(dt.strptime(startday, '%Y-%m-%d'))
+            print(startday)
+        else:
+            endday = endday
         while startday < endday:
             ll.append(str(startday))
             startday += day
         lt = ll.index(yesterday)
-        print(lt)
         return lt