zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update

This commit is contained in:
caoqianming 2020-07-06 17:50:25 +08:00
parent 85d0f12859
commit f114130891
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/apps/ability/views.py
View File

@ -88,7 +88,7 @@ class CMAViewSet(ModelViewSet):
os.chdir(fulldir) os.chdir(fulldir)
rar.extractall() rar.extractall()
rar.close() rar.close()
CMA.objects.filter(type='sub').delete() # CMA.objects.filter(type='sub').delete()
for root, dirs, files in os.walk(fulldir): for root, dirs, files in os.walk(fulldir):
for f in files: for f in files:
if f.endswith('.xls'): if f.endswith('.xls'):
@ -98,7 +98,7 @@ class CMAViewSet(ModelViewSet):
fulldir = fullpath.replace('.zip','') fulldir = fullpath.replace('.zip','')
os.mkdir(fulldir) os.mkdir(fulldir)
os.chdir(fulldir) os.chdir(fulldir)
CMA.objects.filter(type='sub').delete() # CMA.objects.filter(type='sub').delete()
with zipfile.ZipFile(fullpath,'r') as zzz: with zipfile.ZipFile(fullpath,'r') as zzz:
zzz.extractall(fulldir) zzz.extractall(fulldir)
for root, dirs, files in os.walk(fulldir): for root, dirs, files in os.walk(fulldir):
@ -220,6 +220,8 @@ def import_cma2(filename, path):
sheet = wb.worksheets[0] sheet = wb.worksheets[0]
datalist = [] datalist = []
sszx = filename.split('-')[0] sszx = filename.split('-')[0]
if CMA.objects.filter(sszx=sszx, type='sub').exists():
CMA.objects.filter(sszx=sszx, type='sub').delete()
i = 3 i = 3
max_row = sheet.max_row max_row = sheet.max_row
while i<max_row+1: while i<max_row+1: