From 889bf29dab7c3d774c41715b24993889a50ef98e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 15 Dec 2020 17:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=B8=E5=8F=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/operation.html | 2 +-
 safesite/views.py                 | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/safesite/templates/operation.html b/safesite/templates/operation.html
index 8fde6411..448ce933 100644
--- a/safesite/templates/operation.html
+++ b/safesite/templates/operation.html
@@ -166,7 +166,7 @@
     }
     function exportzyexcel() {
         var querydata = $('#searchzyff').serializeJSON();
-        let url = 'api/operation?a=exportexcel'+parseParams(querydata)
+        let url = 'api/operation?a=exportexcel&'+ parseParams(querydata)
         window.open(url);
     }
     function gbzy(){
diff --git a/safesite/views.py b/safesite/views.py
index fd509d48..4409f26f 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -5420,7 +5420,12 @@ def apioperation(req):
         userid = req.session['userid']
         usecomp = User.objects.get(userid=userid).usecomp
         a = Operation.objects.filter(
-            usecomp=usecomp, deletemark=1).order_by('-submittime')
+            usecomp=usecomp, deletemark=1)
+        if req.GET.get('qssj', None):
+            a = a.filter(kssj__gte=req.GET.get('qssj'))
+        if req.GET.get('jssj', None):
+            a = a.filter(jssj__lte=req.GET.get('jssj'))
+        a = a.order_by('-submittime')
         res = exportxlsx('zy', a)
         return res
     elif a == 'listtodo':