作业bug
This commit is contained in:
parent
92583ef37f
commit
838dc9fee8
|
@ -5887,6 +5887,36 @@ def apioperation(req):
|
||||||
oldindex = obj.zyzt['index']
|
oldindex = obj.zyzt['index']
|
||||||
nextindex = obj.zyzt['index']+1
|
nextindex = obj.zyzt['index']+1
|
||||||
spruser = User.objects.get(userid=userid)
|
spruser = User.objects.get(userid=userid)
|
||||||
|
if 'bhzy' in data: # 如果驳回作业
|
||||||
|
Operspxq.objects.create(
|
||||||
|
oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=3, spbm=spruser.ubelongpart, suggestion=data.get('suggestion', None))
|
||||||
|
obj.zyzt = {'zyzt': '驳回修改中', 'index': -1}
|
||||||
|
obj.todouser = obj.zyfzr
|
||||||
|
obj.save()
|
||||||
|
postdict = {
|
||||||
|
'touser': obj.todouser.openid,
|
||||||
|
'template_id': 'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0',
|
||||||
|
'miniprogram': {'appid': 'wx5c39b569f01c27db'},
|
||||||
|
'data': {
|
||||||
|
'first': {
|
||||||
|
'value': obj.zylx.dickeyname + '作业审批未通过:'
|
||||||
|
},
|
||||||
|
'keyword1': {
|
||||||
|
'value': obj.zynr
|
||||||
|
},
|
||||||
|
'keyword2': {
|
||||||
|
'value': obj.kssj
|
||||||
|
},
|
||||||
|
'keyword3': {
|
||||||
|
'value': obj.zydd
|
||||||
|
},
|
||||||
|
'remark': {
|
||||||
|
'value': '你是作业负责人,请及时修改作业申请并重新提交!'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
send_wechatmsg.delay(postdict)
|
||||||
|
return JsonResponse({"code": 1})
|
||||||
if oldindex == 0:
|
if oldindex == 0:
|
||||||
spr1 = data['spr1'] if 'spr1' in data else None
|
spr1 = data['spr1'] if 'spr1' in data else None
|
||||||
spr2 = data['spr2'] if 'spr2' in data else None
|
spr2 = data['spr2'] if 'spr2' in data else None
|
||||||
|
@ -5936,36 +5966,6 @@ def apioperation(req):
|
||||||
send_wechatmsgs.delay(postdict, tolist)
|
send_wechatmsgs.delay(postdict, tolist)
|
||||||
return JsonResponse({"code": 1})
|
return JsonResponse({"code": 1})
|
||||||
nextindex = nextindex + 1
|
nextindex = nextindex + 1
|
||||||
if 'bhzy' in data: # 如果驳回作业
|
|
||||||
Operspxq.objects.create(
|
|
||||||
oper=obj, jdmc=obj.zyzt['splc'][oldindex]['jdmc'], spr=spruser, checked=3, spbm=spruser.ubelongpart, suggestion=data.get('suggestion', None))
|
|
||||||
obj.zyzt = {'zyzt': '驳回修改中', 'index': -1}
|
|
||||||
obj.todouser = obj.zyfzr
|
|
||||||
obj.save()
|
|
||||||
postdict = {
|
|
||||||
'touser': obj.todouser.openid,
|
|
||||||
'template_id': 'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0',
|
|
||||||
'miniprogram': {'appid': 'wx5c39b569f01c27db'},
|
|
||||||
'data': {
|
|
||||||
'first': {
|
|
||||||
'value': obj.zylx.dickeyname + '作业审批未通过:'
|
|
||||||
},
|
|
||||||
'keyword1': {
|
|
||||||
'value': obj.zynr
|
|
||||||
},
|
|
||||||
'keyword2': {
|
|
||||||
'value': obj.kssj
|
|
||||||
},
|
|
||||||
'keyword3': {
|
|
||||||
'value': obj.zydd
|
|
||||||
},
|
|
||||||
'remark': {
|
|
||||||
'value': '你是作业负责人,请及时修改作业申请并重新提交!'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
send_wechatmsg.delay(postdict)
|
|
||||||
return JsonResponse({"code": 1})
|
|
||||||
if 'zjsp' in data: # 转交上级审批
|
if 'zjsp' in data: # 转交上级审批
|
||||||
if spruser.ubelongpart.parentid:
|
if spruser.ubelongpart.parentid:
|
||||||
newsprs = getsprs(userid, spruser.ubelongpart.parentid)
|
newsprs = getsprs(userid, spruser.ubelongpart.parentid)
|
||||||
|
|
Loading…
Reference in New Issue