This commit is contained in:
512song committed 2023-12-12 04:43:05 +00:00
1 parent 54a610a08f
commit f47c1db021
2 files changed
+103 -66

No files matched your search

+35 -41
View File
@@ -53,15 +53,15 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": 29,
"id": "dc0a78bb-ce82-4f6d-ba53-8bd9655f39af",
"metadata": {
"execution": {
"iopub.execute_input": "2023-11-28T08:21:51.973825Z",
"iopub.status.busy": "2023-11-28T08:21:51.973366Z",
"iopub.status.idle": "2023-11-28T08:21:52.110628Z",
"shell.execute_reply": "2023-11-28T08:21:52.110182Z",
"shell.execute_reply.started": "2023-11-28T08:21:51.973788Z"
"iopub.execute_input": "2023-12-12T04:25:43.981437Z",
"iopub.status.busy": "2023-12-12T04:25:43.980663Z",
"iopub.status.idle": "2023-12-12T04:25:44.029168Z",
"shell.execute_reply": "2023-12-12T04:25:44.026384Z",
"shell.execute_reply.started": "2023-12-12T04:25:43.981364Z"
},
"tags": []
},
@@ -70,7 +70,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"26\n"
"32\n"
]
}
],
@@ -87,7 +87,7 @@
"\n",
"\n",
"list1 = []\n",
"filename = 'data/Survey_20231128.csv'\n",
"filename = 'data/Survey_20231211.csv'\n",
"with open(filename,'r',newline='') as csv_file:\n",
" fl = csv.reader(csv_file,delimiter=',')\n",
" header = next(fl) \n",
@@ -95,7 +95,7 @@
" #line = re.sub('[\\r\\n\\f ]{1,}', '', line)\n",
" list1.append(line)\n",
"dict2 = {}\n",
"m_rq = '2023-11-20'\n",
"m_rq = '2023-12-11'\n",
"rq= date.fromisoformat(m_rq.replace('/','-'))\n",
"for item in list1:\n",
" if item[2] in dict1.keys(): \n",
@@ -131,15 +131,15 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 30,
"id": "5b646b5d-c4f6-4d37-9510-30fcbef44855",
"metadata": {
"execution": {
"iopub.execute_input": "2023-11-28T08:22:06.586472Z",
"iopub.status.busy": "2023-11-28T08:22:06.586205Z",
"iopub.status.idle": "2023-11-28T08:22:06.590979Z",
"shell.execute_reply": "2023-11-28T08:22:06.590514Z",
"shell.execute_reply.started": "2023-11-28T08:22:06.586440Z"
"iopub.execute_input": "2023-12-12T04:25:52.599199Z",
"iopub.status.busy": "2023-12-12T04:25:52.598384Z",
"iopub.status.idle": "2023-12-12T04:25:52.621363Z",
"shell.execute_reply": "2023-12-12T04:25:52.618548Z",
"shell.execute_reply.started": "2023-12-12T04:25:52.599125Z"
},
"tags": []
},
@@ -148,13 +148,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"13501017366 程大庆\n",
"13910270600 袁正东\n",
"13501017663 李志玖\n",
"13901363461 陈学军\n",
"13911795921 祁向东\n",
"18600419150 鲁兴隆\n",
"17316020604 刘凡\n"
"13910270600 袁正东\n"
]
}
],
@@ -169,7 +163,7 @@
"\n",
"\n",
"list1 = []\n",
"filename = 'data/Survey_20231128.csv'\n",
"filename = 'data/Survey_20231211.csv'\n",
"with open(filename,'r',newline='') as csv_file:\n",
" fl = csv.reader(csv_file,delimiter=',')\n",
" header = next(fl) \n",
@@ -226,15 +220,15 @@
},
{
"cell_type": "code",
"execution_count": 12,
"execution_count": 33,
"id": "ab9b8e0c-53dd-4b93-a42a-7d1952b0423a",
"metadata": {
"execution": {
"iopub.execute_input": "2023-11-21T02:43:16.230464Z",
"iopub.status.busy": "2023-11-21T02:43:16.229691Z",
"iopub.status.idle": "2023-11-21T02:43:18.707519Z",
"shell.execute_reply": "2023-11-21T02:43:18.706897Z",
"shell.execute_reply.started": "2023-11-21T02:43:16.230392Z"
"iopub.execute_input": "2023-12-12T04:36:12.507368Z",
"iopub.status.busy": "2023-12-12T04:36:12.507004Z",
"iopub.status.idle": "2023-12-12T04:36:18.957893Z",
"shell.execute_reply": "2023-12-12T04:36:18.955648Z",
"shell.execute_reply.started": "2023-12-12T04:36:12.507335Z"
},
"tags": []
},
@@ -265,8 +259,16 @@
"15810404851 王建斌 {\"errmsg\":\"ok\"}\n",
"15810830119 奚晓亮 {\"errmsg\":\"ok\"}\n",
"13651123781 马海涛 {\"errmsg\":\"ok\"}\n",
"17310308917 刘凡 {\"errmsg\":\"ok\"}\n",
"13651357627 高桂所 {\"errmsg\":\"ok\"}\n",
"13718793001 乔金梅 {\"errmsg\":\"ok\"}\n"
"13718793001 乔金梅 {\"errmsg\":\"ok\"}\n",
"15501167098 马宇 {\"errmsg\":\"ok\"}\n",
"13601312169 白华 {\"errmsg\":\"ok\"}\n",
"13901363461 陈学军 {\"errmsg\":\"ok\"}\n",
"13501017663 李志玖 {\"errmsg\":\"ok\"}\n",
"13911795921 祁向东 {\"errmsg\":\"ok\"}\n",
"18600419150 鲁兴隆 {\"errmsg\":\"ok\"}\n",
"13501017366 程大庆 {\"errmsg\":\"ok\"}\n"
]
}
],
@@ -283,7 +285,7 @@
"with open(filename,'r') as fl:\n",
" dict1 = json.load(fl)\n",
"list1 = []\n",
"fiie_path ='./政法委1/'\n",
"fiie_path ='./农工党延庆支部/'\n",
"list_item = ['lung','grip','flexion','jump','pushup','balance','reaction','step','situp','bmi']\n",
"i = 27\n",
"list2 = []\n",
@@ -291,7 +293,7 @@
" list1 = []\n",
" mydata = {} \n",
" id = k.rjust(3,\"0\")\n",
" mydata['path'] = fiie_path+id+'-'+ v['name']+'.pdf'\n",
" mydata['path'] = fiie_path+ v['name']+'.pdf'\n",
" mydata['title'] = '农工党延庆支部'\n",
" #mydata['subtitle'] = ''\n",
" mydata['id'] = id\n",
@@ -306,15 +308,7 @@
" mydata.setdefault('surveys',{})\n",
" mydata['surveys']['tcm'] = v['tcm']\n",
" \n",
" mydata['fits'] = {}\n",
" #mydata.setdefault('fits',{})\n",
" for item in list_item:\n",
" if item in dict1[k].keys():\n",
" if item in ['lung','pushup','step','situp']:\n",
" mark = dict1[k][item]['成绩'].split()[0].split('.')[0]\n",
" else:\n",
" mark = dict1[k][item]['成绩'].split()[0]\n",
" mydata['fits'][item] = {'mark':mark,'score':dict1[k][item]['score']}\n",
" \n",
" #print(mydata) \n",
" \n",
" list1.append(mydata)\n",