From 7abcd74f7e770c73e95f8b7b98c834b814e9c5a2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 10 Nov 2020 21:05:32 +0800 Subject: [PATCH] some fix --- safesite/views.py | 169 +++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 85 deletions(-) diff --git a/safesite/views.py b/safesite/views.py index e19d0b71..09aace83 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -1,44 +1,50 @@ -from captcha.helpers import captcha_image_url -from captcha.models import CaptchaStore -from django.http import request -from django.shortcuts import render, redirect -from django.http import HttpResponse, HttpResponseRedirect, JsonResponse -from .models import * -from django.template import RequestContext -from django.views.decorators.csrf import csrf_exempt -from django.core import serializers -from django.conf import settings -from django.views.generic import TemplateView -from .forms import UserForm -import json -from uuid import UUID -import os -import time -from datetime import datetime, date, timedelta -from django.db.models import F, Count, Sum, Avg -import requests -from .tasks import send_wechatmsgs, send_wechatmsg, yjjs, gettime, yjjs_px, yjjs_yl, updateTzzs, updateAqzs, yjjs_gc, yjjs_ws -from .export import exportdoc, exportxlsx, exportyjdoc, exportsimplexlsx, exportdoc2 -from .daoru import drusers, drequipments, drrisks, drquestions, cal_riskact_level, cal_area_risk_level, makeqr, makeqr_train, makeqr_riskact, makeqr_examtest, makeqr_area,drtodotroubles -from django.forms.models import model_to_dict -from .safespider import getTzzs, getAqzs -from duibiao import calsim -from django.db.models import Q -from django.core.serializers.json import DjangoJSONEncoder -from io import StringIO -import operator -import jwt import decimal -from . import forms -from .models import CompanyInfo -from django.contrib.sessions.models import Session -from groups import models as g_models +import json import logging -from django.contrib.auth.hashers import make_password, check_password -import re +import operator +import os import pickle import random +import re +import time +from datetime import date, datetime, timedelta +from io import StringIO +from uuid import UUID + +import jwt +import requests +from captcha.helpers import captcha_image_url +from captcha.models import CaptchaStore +from django.conf import settings +from django.contrib.auth.hashers import check_password, make_password +from django.contrib.sessions.models import Session +from django.core import serializers +from django.core.serializers.json import DjangoJSONEncoder +from django.db.models import Avg, Count, F, Q, Sum +from django.forms.models import model_to_dict +from django.http import (HttpResponse, HttpResponseRedirect, JsonResponse, + request) +from django.shortcuts import redirect, render +from django.template import RequestContext +from django.views.decorators.csrf import csrf_exempt +from django.views.generic import TemplateView +from duibiao import calsim +from groups import models as g_models + +from . import forms +from .daoru import (cal_area_risk_level, cal_riskact_level, drequipments, + drquestions, drrisks, drtodotroubles, drusers, makeqr, + makeqr_area, makeqr_examtest, makeqr_riskact, makeqr_train) +from .export import (exportdoc, exportdoc2, exportsimplexlsx, exportxlsx, + exportyjdoc) +from .forms import UserForm +from .models import * +from .models import CompanyInfo +from .safespider import getAqzs, getTzzs +from .tasks import (gettime, send_wechatmsg, send_wechatmsgs, updateAqzs, + updateTzzs, yjjs, yjjs_gc, yjjs_px, yjjs_ws, yjjs_yl) + logger = logging.getLogger('log') # 分页功能 @@ -3044,15 +3050,15 @@ def pxhandle(req): companyid = getcompany(userid) a = Train.objects.filter(usecomp=Partment.objects.get( partid=companyid)).exclude(deletemark=0) - qssj = req.GET.get('qssj') - jssj = req.GET.get('jssj') - pxbm = req.GET.get('trainpart') - pxjb = req.GET.get('trainlevel') - pxnr = req.GET.get('traincontent') + qssj = req.GET.get('qssj', None) + jssj = req.GET.get('jssj', None) + pxbm = req.GET.get('trainpart', None) + pxjb = req.GET.get('trainlevel', None) + pxnr = req.GET.get('traincontent', None) if pxjb: a = a.filter(trainlevel__dicid=pxjb) if pxnr: - a = a.filter(traincontent__dickeyid=yhlb) + a = a.filter(traincontent__dickeyid=pxnr) if pxbm: a = a.filter(trainpart__partid=pxbm) if qssj: @@ -3148,15 +3154,15 @@ def pxhandle(req): companyid = getcompany(userid) a = Train.objects.filter(usecomp=Partment.objects.get( partid=companyid)).exclude(deletemark=0) - qssj = req.GET.get('qssj') - jssj = req.GET.get('jssj') - pxbm = req.GET.get('trainpart') - pxjb = req.GET.get('trainlevel') - pxnr = req.GET.get('traincontent') + qssj = req.GET.get('qssj', None) + jssj = req.GET.get('jssj', None) + pxbm = req.GET.get('trainpart', None) + pxjb = req.GET.get('trainlevel', None) + pxnr = req.GET.get('traincontent', None) if pxjb: a = a.filter(trainlevel__dicid=pxjb) if pxnr: - a = a.filter(traincontent__dickeyid=yhlb) + a = a.filter(traincontent__dickeyid=pxnr) if pxbm: a = a.filter(trainpart__partid=pxbm) if qssj: @@ -4150,20 +4156,20 @@ def apisocert(req): cardnum=cardnum, czxm=i['操作项目'], defaults=updated_values) data1.append(i['操作项目']) gender = i['性别'] - else: - obj = Socertificate.objects.get( - cardnum=cardnum, czxm=i['操作项目']) - if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']: - obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None - obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None - obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None - obj.sjfssj = i['实际复审时间'] if i['实际复审时间'] else None - try: - zsst = guoqi(i['应复审日期']) - obj.zszt = zsst - except: - pass - obj.save() + else: + obj = Socertificate.objects.get( + cardnum=cardnum, czxm=i['操作项目']) + if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']: + obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None + obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None + obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None + obj.sjfssj = i['实际复审时间'] if i['实际复审时间'] else None + try: + zsst = guoqi(i['应复审日期']) + obj.zszt = zsst + except: + pass + obj.save() return JsonResponse({"code": 1}) elif a == 'del': id = req.GET.get('id') @@ -4315,19 +4321,19 @@ def apisafecert(req): cardnum=cardnum, zglx=i['资格类型'], defaults=updated_values) data1.append(i['资格类型']) gender = i['性别'] - else: - obj = Socertificate.objects.get( - cardnum=cardnum, czxm=i['资格类型']) - if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']: - obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None - obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None - obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None - try: - zsst = guoqi(i['应复审日期']) - obj.zszt = zsst - except: - pass - obj.save() + else: + obj = Socertificate.objects.get( + cardnum=cardnum, czxm=i['资格类型']) + if obj.yxqjssj.strftime('%Y-%m-%d') < i['有效期结束时间']: + obj.yfsrq = i['应复审日期'] if i['应复审日期'] else None + obj.yxqkssj = i['有效期开始时间'] if i['有效期开始时间'] else None + obj.yxqjssj = i['有效期结束时间'] if i['有效期结束时间'] else None + try: + zsst = guoqi(i['应复审日期']) + obj.zszt = zsst + except: + pass + obj.save() return JsonResponse({"code": 1}) elif a == 'del': id = req.GET.get('id') @@ -4459,7 +4465,7 @@ def apiuser(req): return JsonResponse({"code": 1}) elif a == 'updateHeadimg': userid = req.GET.get('userid') - user = User.objects.get(userid=ruserid) + user = User.objects.get(userid=userid) data = json.loads(req.body.decode('utf-8')) if 'headimgurl' in data: user.headimgurl = data['headimgurl'] @@ -5680,15 +5686,6 @@ def apioperation(req): return JsonResponse({"code": 1, "data": {'spr1Array': list(spr1Array), 'spr2Array': list(spr2Array)}}) -def apioperationsetting(req): - a = req.GET.get('a') - comp = User.objects.get(userid=req.session['userid']).usecomp - if a == 'listall': - objs = (Operationsetting.objects.filter(usecomps__contains=',1,') | Operationsetting.objects.filter( - usecomps__contains=','+str(comp.partid)+',')).exclude(nousecomps__contains=','+str(comp.partid)+',').values('id', 'name') - x = transstr(objs, 'id', 'name') - return HttpResponse(x, content_type="application/json") - def apifxcs(req): a = req.GET.get('a') @@ -6564,6 +6561,8 @@ def apitrain(req): return res from groups import models as g_models + + def apiquestioncat(req): a = req.GET.get('a') userid = req.session['userid']