update

src/common/models.py

@@ -29,7 +29,7 @@ class Subject(models.Model):
         app_label = "common"
 
 class Class(models.Model):
-    subject_id = models.IntegerField(u"培训科目",blank=True,null=True)
+    subject_id = models.TextField(u"培训科目",blank=True,null=True)
     subject_name = models.CharField(u"培训科目",blank=True,null=True,max_length=100)
     subject_item = models.CharField(u"培训科目",blank=True,null=True,max_length=255)
     name = models.CharField(u"名称",max_length=256,blank=True)

src/manage/controls.py

@@ -252,6 +252,16 @@ def get_video_list(request):
     data = list(qset.values())
     return total,data
 
+def get_subject_item(subject_id):
+    """
+    """
+    data = []
+    for sid in subject_id:
+        tmp = []
+        for ssid in sid:
+            tmp.append(cm.Subject.objects.filter(id=ssid).first().name)
+        data.append("|".join(tmp))
+    return ",".join(data)
 
 def add_class(request):
     uid = request.user.id
@@ -265,8 +275,10 @@ def add_class(request):
     need_params.append("subject_id")
     need_params.append("remind")
     vals = ccf.get_need_params(*need_params,**qdata)
+    subject_id = vals["subject_id"]
     vals["cid"] = uid
     vals["subject_id"] = json.dumps(vals["subject_id"])
+    vals["subject_item"] = get_subject_item(subject_id)
     #vals["subject_name"] = vals["subject_item"].split("|")[0]
     obj = cm.Class.objects.create(**vals)
     return obj.id
@@ -448,6 +460,8 @@ def add_account(request):
     obj = cm.UserInfo.objects.create(**vals)
     return obj.id
 
+
+
 def update_class(request):
     uid = request.user.id
     qdata = request.json
@@ -455,11 +469,14 @@ def update_class(request):
     mse = ccf.check_params(*need_params,**qdata)
     if mse:
         raise ce.TipException(mse)
-    need_params.extend(["name","subject_id","subject_item","signup_limit","remark"])
+    need_params.extend(["name","subject_id","subject_item","signup_limit","remark","remind"])
     vals = ccf.get_need_params(*need_params,**qdata)
     id = vals.pop("id")
     vals["cid"] = uid
-    vals["subject_name"] = vals["subject_item"].split("|")[0]
+    subject_id = vals["subject_id"]
+    vals["subject_id"] = json.dumps(vals["subject_id"])
+    vals["subject_item"] = get_subject_item(subject_id)
+    #vals["subject_name"] = vals["subject_item"].split("|")[0]
     obj = cm.Class.objects.filter(id=id).update(**vals)
     return obj
 
@@ -518,6 +535,7 @@ def get_class_info(request):
         raise ce.TipException(mse)
     id = qdata.get("id")
     obj = cm.Class.objects.filter(id=id).values().first()
+    obj["subject_id"] = json.loads(obj["subject_id"])
     return obj
 
 def get_account_info(request):
@@ -719,7 +737,7 @@ def update_signup(request):
     need_params.extend(["name","sex","idno","education","phone","train_type",
         "receive_card","area","price","company","class_id","remark","idnoimg_face",
         "idnoimg_back","halfbody_img","education_img","oldcard_img","admin_remark",
-        "subject_item","subject_id","address","exam_time","classhour_cert_status"])
+        "subject_item","subject_id","address","exam_time","classhour_cert_status","health_img"])
     vals = ccf.get_need_params(*need_params,**qdata)
     if vals.get("idnoimg_face") and "?" in vals["idnoimg_face"]:
         vals["idnoimg_face"] = vals["idnoimg_face"].split("?")[0]
@@ -731,6 +749,8 @@ def update_signup(request):
         vals["education_img"] = vals["education_img"].split("?")[0]
     if vals.get("oldcard_img") and "?" in vals["oldcard_img"]:
         vals["oldcard_img"] = vals["oldcard_img"].split("?")[0]
+    if vals.get("health_img") and "?" in vals["health_img"]:
+        vals["health_img"] = vals["health_img"].split("?")[0]
     if vals.get("classhour_cert_status"):
         vals["order_status"] = 7
     if qdata.get("train_time"):
@@ -763,6 +783,16 @@ def update_signup(request):
 
     vals["cid"] = uid
     vals["update_time"] = datetime.datetime.now()
+    subject_id = vals.get("subject_id")
+    train_type = vals.get("train_type")
+    subject_item = cm.Subject.objects.filter(id=subject_id).first()
+    if subject_item:
+        if train_type == "新办":
+            vals["price"] = subject_item.price_new
+        if train_type == "复审":
+            vals["price"] = subject_item.price_re
+        if train_type == "换证":
+            vals["price"] = subject_item.price_change
     obj = cm.SignupOrders.objects.filter(id__in=ids).update(**vals)
     if qdata.get("exam_time"):
         #发送培训通知
@@ -1449,7 +1479,8 @@ def download_zip(request):
                 subject_item = o.subject_item
                 if u"特种作业" in subject_item:
                     doc = DocxTemplate(tpl_1)
-                elif u"负责人" in subject_item:
+                #elif u"负责人" in subject_item:
+                elif u"安全生产知识和管理能力" in subject_item:
                     doc = DocxTemplate(tpl_2)
                 elif u"特种设备" in subject_item:
                     doc = DocxTemplate(tpl_4)
@@ -1479,7 +1510,7 @@ def download_zip(request):
                         "train_time_end":o.train_time_end,"birthday":birthday,
                         "idnoimg_face":InlineImage(doc,idnoimg_face,height=Mm(82.5),width=Mm(140.66)),
                         "idnoimg_back":InlineImage(doc,idnoimg_back,height=Mm(82.5),width=Mm(140.66)),
-                        "halfbody_img":InlineImage(doc,halfbody_img,height=Mm(40.97),width=Mm(28.91)),
+                        "halfbody_img":InlineImage(doc,halfbody_img,height=Mm(30.97),width=Mm(28.91)),
                         "education_img":InlineImage(doc,education_img,height=Mm(82.5),width=Mm(140.66))
                         }
                 if oldcard_img and o.train_type in [u"复审",u"换证"]: