From fd8861ba4cdeb5746ad2a61490072df967365f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=80=C3=AE=C3=97=C3=9A=C3=95=C3=B1?= <lizz556@163.com>
Date: Thu, 8 Sep 2022 19:19:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=88=99=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api_v1/endpoints/interview.py | 36 +++++++++++++++++++++++++++----
 models/interview_zsgc.py          | 16 +++++++-------
 utils/re_to_jianli.py             |  2 +-
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/api/api_v1/endpoints/interview.py b/api/api_v1/endpoints/interview.py
index 5bd38a6..845abcc 100644
--- a/api/api_v1/endpoints/interview.py
+++ b/api/api_v1/endpoints/interview.py
@@ -88,10 +88,38 @@ def chkData(data):
         if 'pass_why' in res1:
             key16 = res1['pass_why']
             res1['pass_why'] = pass_why_dict.get(key16, '初筛')
-        work_list = i['work_list']
-        if work_list:
-            work_list = [eval(i1) for i1 in work_list]
-        res1['work_list'] = work_list
+        if 'work_list' in i:
+            work_list = i['work_list']
+            if work_list:
+                work_list = [json.loads(i) for i in work_list]
+                work_list = [eval(i) for i in work_list]
+            else:
+                work_list = []
+            res1['work_list'] = work_list
+        if 'project_undergo' in i:
+            project_undergo = i['project_undergo']
+            if project_undergo:
+                project_undergo = [json.loads(i) for i in project_undergo]
+                project_undergo = [eval(i) for i in project_undergo]
+            else:
+                project_undergo = []
+            res1['project_undergo'] = project_undergo
+        if 'language' in i:
+            language = i['language']
+            if language:
+                language = [json.loads(i) for i in language]
+                language = [eval(i) for i in language]
+            else:
+                language = []
+            res1['language'] = language
+        if 'remembrance' in i:
+            remembrance = i['remembrance']
+            if remembrance:
+                remembrance = [json.loads(i) for i in remembrance]
+                remembrance = [eval(i) for i in remembrance]
+            else:
+                remembrance = []
+            res1['remembrance'] = remembrance
         res_data.append(res1)
     return res_data
 
diff --git a/models/interview_zsgc.py b/models/interview_zsgc.py
index 33a4533..69121e4 100644
--- a/models/interview_zsgc.py
+++ b/models/interview_zsgc.py
@@ -193,21 +193,21 @@ class InterviewDo:
         self.data_in.pop('remembrance_list')
         self.data_in.pop('language_list')
         if self.data_in['project_undergo']:
-            self.data_in['project_undergo'] = json.dumps(self.data_in['project_undergo'])
+            self.data_in['project_undergo'] = [json.dumps(i) for i in self.data_in['project_undergo']]
         else:
-            self.data_in['project_undergo'] = ''
+            self.data_in['project_undergo'] = []
         if self.data_in['work_list']:
-            self.data_in['work_list'] = json.dumps(self.data_in['work_list'])
+            self.data_in['work_list'] = [json.dumps(i) for i in self.data_in['project_undergo']]
         else:
-            self.data_in['work_list'] = ''
+            self.data_in['work_list'] = []
         if self.data_in['language']:
-            self.data_in['language'] = json.dumps(self.data_in['language'])
+            self.data_in['language'] = [json.dumps(i) for i in self.data_in['project_undergo']]
         else:
-            self.data_in['language'] = ''
+            self.data_in['language'] = []
         if self.data_in['remembrance']:
-            self.data_in['remembrance'] = json.dumps(self.data_in['remembrance'])
+            self.data_in['remembrance'] = [json.dumps(i) for i in self.data_in['project_undergo']]
         else:
-            self.data_in['remembrance'] = ''
+            self.data_in['remembrance'] = []
 
         # 字符串转datetime
         if self.data_in.get('in_time', ''):
diff --git a/utils/re_to_jianli.py b/utils/re_to_jianli.py
index dbfefed..1feb275 100644
--- a/utils/re_to_jianli.py
+++ b/utils/re_to_jianli.py
@@ -49,7 +49,7 @@ def fmt_txt(chk_str):
         "job_name": "",
         "hr_name": "",
         "work_exp": 0,
-        "interview_stage": 1,
+        "interview_stage": 0,
         "owner_name": 2,
         "education": 1,
         "work_undergo": [],