From 7068c0311ab70fd7d9ffeef3b1cf9e105575ed27 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 5 Jan 2021 16:59:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safesite/templates/abtrain.html |  7 +++++--
 safesite/views.py               | 30 +++++++++++++++++++-----------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/safesite/templates/abtrain.html b/safesite/templates/abtrain.html
index 48b55749..db2e46d4 100644
--- a/safesite/templates/abtrain.html
+++ b/safesite/templates/abtrain.html
@@ -50,7 +50,7 @@
             </div>
 
             <div style="margin-bottom:5px">
-                <input id="detailcontent" name="detailcontent" class="easyui-textbox" style="width:480px;height:60px" data-options="label:'具体内容',multiline:true,">
+                <input id="detailcontent" name="detailcontent" class="easyui-textbox" style="width:480px;height:60px" data-options="label:'具体内容',multiline:true," value="">
             </div>
             <div style="margin-bottom:5px">
                 <input class="easyui-textbox" id="participantname" style="width:480px;height:60px" editable="false"
@@ -290,7 +290,10 @@
                     $("#knownumdiv,#filediv,#pxxgdiv,#examtestdiv").show();
                     for(var i=0;i<data.material.length;i++){
                         let x = data.material[i]
-                        $("#fileol").append('<li><button  onclick="removep(this)" >删除</button><a class = "filea" target="_blank"  filepath="' + x + '" href="/' + x + '" >' + x.split('_').pop() + '</a></li>');
+                        if(x){
+                            $("#fileol").append('<li><button  onclick="removep(this)" >删除</button><a class = "filea" target="_blank"  filepath="' + x + '" href="/' + x + '" >' + x.split('_').pop() + '</a></li>');
+                        }
+                        
                     }
 
 
diff --git a/safesite/views.py b/safesite/views.py
index 70c26d39..1bde2399 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -1792,17 +1792,25 @@ def adddrill(req):
 def accesstrain(req):
     userid = req.session.get('userid')
     trainid = req.GET.get('trainid')
-    detailcontent = req.POST.get('detailcontent')
+    detailcontent = req.POST.get('detailcontent', None)
     pxxg = req.POST.get('pxxg')
     knownum = req.POST.get('knownum')
-    duration = req.POST.get('duration')
-    upfile = req.POST.get('upfile')
-    a = Train.objects.filter(trainid=trainid)
-    a.update(detailcontent=detailcontent, knownum=knownum,
-             material=upfile, state=1, duration=duration, pxxg=pxxg)
+    duration = req.POST.get('duration', None)
+    upfile = req.POST.get('upfile', None)
+    a = Train.objects.get(trainid=trainid)
+    if detailcontent:
+        a.detailcontent = detailcontent
+    a.knownum = knownum
+    if upfile:
+        a.material = upfile
+    if duration:
+        a.duration = duration
+    a.pxxg = pxxg
+    a.state = 1
+    a.save()
     companyid = getcompany(userid)
     # 绑定考试
-    if req.POST.get('examtest'):
+    if req.POST.get('examtest',None):
         a.update(examtest=ExamTest.objects.get(id=req.POST.get('examtest')))
         for i in Trainuser.objects.filter(train__trainid=trainid):
             objs = ExamTestDetail.objects.filter(
@@ -3112,17 +3120,17 @@ def pxhandle(req):
             partid=companyid), deletemark=1).order_by('-modifytime')
         total = a.count()
         startnum, endnum = fenye(req)
-        a = a[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
+        a = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
                                       'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid', 'lecturer__userid', 'trainplan__year', 'trainplan__month', 'trainplan__purpose')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif req.GET.get('a') == 'listtodo':
         userid = req.session['userid']
         companyid = getcompany(userid)
         a = Train.objects.filter(usecomp=Partment.objects.get(
-            partid=companyid), deletemark=1, state=0, submituser__userid=userid).order_by('-modifytime')
+            partid=companyid), deletemark=1, submituser__userid=userid).order_by('-modifytime')
         total = a.count()
         startnum, endnum = fenye(req)
-        a = a[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
+        a = a.order_by('-starttime')[startnum:endnum].values('trainnum', 'trainid', 'state', 'trainplace', 'starttime', 'trainname',
                                       'traintype__dickeyname', 'teacher', 'lecturer__name', 'submituser__name', 'submituser__userid')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif req.GET.get('a') == 'listcj':
@@ -3132,7 +3140,7 @@ def pxhandle(req):
             userid=userid), train__deletemark=1).order_by('-train__modifytime')
         total = a.count()
         startnum, endnum = fenye(req)
-        a = a[startnum:endnum].values('train__trainnum', 'train__trainid', 'train__state', 'train__trainplace',
+        a = a.order_by('-starttime')[startnum:endnum].values('train__trainnum', 'train__trainid', 'train__state', 'train__trainplace',
                                       'train__starttime', 'train__trainname', 'checked', 'train__teacher', 'train__lecturer__name')
         return HttpResponse(transjson(total, a), content_type="application/json")
     elif req.GET.get('a') == 'dqdnum':