From 4da9113f3f95d42ab837f241c37a6bd450d1a6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80=C3=AE=C3=97=C3=9A=C3=95=C3=B1?= Date: Wed, 21 Sep 2022 17:51:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=88=B6=E7=AE=80=E5=8E=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/re_to_jianli.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/utils/re_to_jianli.py b/utils/re_to_jianli.py index 4a0609d..5283cc0 100644 --- a/utils/re_to_jianli.py +++ b/utils/re_to_jianli.py @@ -381,7 +381,7 @@ def fmt_txt(chk_str): new_chk_project = project_chk_str2.replace('\n', '').replace('■', '').strip() dict_project['comment'] += new_chk_project.split('职责')[0] dict_project['duty'] += new_chk_project.split('职责')[1].split('相关技术')[0] - dict_project['work'] += new_chk_project.split('职责')[1].split('相关技术')[-1] + dict_project['duty'] += new_chk_project.split('职责')[1].split('相关技术')[-1] else: project_chk_str2_list = re.split('(:|：)', project_chk_str2) if project_chk_str2_list: @@ -469,13 +469,13 @@ def fmt_txt(chk_str): dict_project1 = copy.deepcopy(dict_project) dict_project1['name'] = re.split('[:|：]', new_p_chk_list[0])[-1] for p_str_true in new_p_chk_list: - if '开发环境' in p_str_true or '开发工具' in p_str_true or '开发技术' in p_str_true or '模块' in p_str_true: - dict_project1['work'] += re.split('[:|：]', p_str_true)[-1] + if '开发环境' in p_str_true or '开发工具' in p_str_true or '开发技术' in p_str_true: + dict_project1['comment'] += re.split('[:|：]', p_str_true)[-1] continue if '项目描述' in p_str_true or '功能介绍' in p_str_true: dict_project1['comment'] += re.split('[:|：]', p_str_true)[-1] continue - if '职责' in p_str_true: + if '职责' in p_str_true or '模块' in p_str_true: dict_project1['duty'] += re.split('[:|：]', p_str_true)[-1] continue project_undergo_list.append(dict_project1) @@ -497,8 +497,8 @@ def fmt_txt(chk_str): dict_project1['time'] = i.split('：')[-1] continue if i.startswith('开发环境'): - dict_project1['work'] += i.split('：')[-1] - chk_key = 'work' + dict_project1['comment'] += i.split('：')[-1] + chk_key = 'comment' continue if i.startswith('功能模块'): dict_project1['duty'] = i.split('：')[-1] @@ -509,11 +509,12 @@ def fmt_txt(chk_str): chk_key = 'comment' continue if i.startswith('技术要点'): - dict_project1['work'] += i.split('：')[-1] - chk_key = 'work' + dict_project1['duty'] += i.split('：')[-1] + chk_key = 'duty' continue project_undergo_list.append(dict_project1) else: + # if re.findall('([0-9]{4}[/|.][0-9]{1,2})', project_undergo2): index2 = -1 name2 = '' new_str_list1 = [] @@ -2308,4 +2309,4 @@ egreat，海尔，MeleA20，MeleA31，LG1154，极米，杰科，亿典等机顶 """ - fmt_txt(chk_str8) + fmt_txt(chk_str9)