绑定企业

apps/admin/tenant/views.py

@@ -74,10 +74,10 @@ class TenantViewSet(CustomModelViewSet):
                 notice_data = {
                     'title':'企业入驻审核通知，请点击查看！',
                     'content':'''您的企业入驻审核已通过，请牢记一下内容：
-                    企业名称：{0}
-                    企业编号：{1}
-                    超级管理员账号：{2}
-                    超级管理员密码：{3}
+                    企业名称：{0}<br>
+                    企业编号：{1}<br>
+                    超级管理员账号：{2}<br>
+                    超级管理员密码：{3}<br>
                     电脑端管理系统网址：https://baoxiu.zzliaoyuan.com/
                     '''.format(tenant.company_name,tenant.company_no,username,password),
                     'create_user':request.user,

apps/wxapp/inspection_order/serializers.py

@@ -52,13 +52,13 @@ class InspectionOrderSerializer(serializers.ModelSerializer):
             device = self.initial_data['device']
         if inspection_result == '0':
             # 巡检状态如果为正常，判断当前教室是否还存有未完成保修的工单
-            repair_orders = RepairOrder.objects.filter(device_address=self.initial_data['device_address'],
-                                                       device_name=self.initial_data['device_name'],
-                                                       device=device,
-                                                       status__in=[settings.NOT_CHECKED, settings.CHECKED,
-                                                                   settings.DISPATCH, settings.HANG_UP])
-            if repair_orders:
-                raise CustomError('该地区还存在未完成的报修！')
+            # repair_orders = RepairOrder.objects.filter(device_address=self.initial_data['device_address'],
+            #                                            device_name=self.initial_data['device_name'],
+            #                                            device=device,
+            #                                            status__in=[settings.NOT_CHECKED, settings.CHECKED,
+            #                                                        settings.DISPATCH, settings.HANG_UP])
+            # if repair_orders:
+            #     raise CustomError('该地区还存在未完成的报修！')
 
             # 状态保存为正常
             validated_data['status'] = InspectionOrder.NOT_REPAIR