diff --git a/safesite/templates/equipmentcheckform.html b/safesite/templates/equipmentcheckform.html index 994167dc..8bfd9c03 100644 --- a/safesite/templates/equipmentcheckform.html +++ b/safesite/templates/equipmentcheckform.html @@ -22,6 +22,7 @@ 检查内容 + 检查类型 diff --git a/safesite/views.py b/safesite/views.py index 6b6f841c..bcddc745 100644 --- a/safesite/views.py +++ b/safesite/views.py @@ -6831,37 +6831,39 @@ def apiinspectitem(req): obj.checked = True if 'checked' in i else False if 'state' in i: obj.state = i['state'] + if i['state'] == '异常待处理': + obj.todouser = getpgr2(userid, User.objects.get(userid=userid).ubelongpart) obj.checkitem = EquipmentCheckItem.objects.get(pk=i['id']) obj.inspect = Inspect.objects.get(pk=data['inspect']) if 'desc' in i: obj.desc = i['desc'] if 'img' in i: obj.img = i['img'] - obj.todouser = getpgr2(userid, User.objects.get(userid=userid).ubelongpart) obj.save() - postdict = { - 'touser': obj.todouser.openid, - 'template_id': 'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0', - 'miniprogram': {'appid': 'wx5c39b569f01c27db'}, - 'data': { - 'first': { - 'value': obj.inspect.equipment.name + '-设备异常待处理:' - }, - 'keyword1': { - 'value': obj.desc - }, - 'keyword2': { - 'value': obj.inspect.creattime - }, - 'keyword3': { - 'value': '' - }, - 'remark': { - 'value': '请及时处理设备异常!' + if obj.state == '异常待处理': + postdict = { + 'touser': obj.todouser.openid, + 'template_id': 'lOuwSE67vZC3ZVFYPZvz2eb7JdFxqx7ysMFkXrYmYh0', + 'miniprogram': {'appid': 'wx5c39b569f01c27db'}, + 'data': { + 'first': { + 'value': obj.inspect.equipment.name + '-设备异常待处理:' + }, + 'keyword1': { + 'value': obj.desc + }, + 'keyword2': { + 'value': obj.inspect.creattime.strftime("%Y-%m-%d %H:%M") + }, + 'keyword3': { + 'value': '' + }, + 'remark': { + 'value': '请及时处理设备异常!' + } + } } - } - } - send_wechatmsg.delay(postdict) + send_wechatmsg.delay(postdict) return JsonResponse({"code": 1}) elif a == 'listmyyc':#我发现的异常记录 objs = InspectItem.objects.filter(inspect__usecomp__partid=companyid, inspect__user__userid=userid).exclude(state='正常')