年报用上传附件表先判重

comData/annualReport1014/BaseCore.py

@@ -655,11 +655,9 @@ class BaseCore:
             return retData
 
     def secrchATT(self, item_id, year, type_id,path):
-        sel_sql = '''select id from clb_sys_attachment where item_id = %s and year = %s and type_id=%s and path=%s'''
-        self.cursor_.execute(sel_sql, (item_id, year, type_id,path))
-        select = self.cursor_.fetchall()
-        print(f'共找到{len(select)}条数据')
-        selects = select[-1]
+        sel_sql = '''select id from clb_sys_attachment where item_id = %s and year = %s and type_id=%s'''
+        self.cursor_.execute(sel_sql, (item_id, year, type_id))
+        selects = self.cursor_.fetchone()
         return selects
     def deliteATT(self,id):
         delitesql = f"delete from clb_sys_attachment where id = '{id}' "
@@ -678,32 +676,32 @@ class BaseCore:
         status = retData['status']
         create_by = retData['create_by']
         page_size = retData['page_size']
-        print(f'---入库时page_size={page_size}---')
+        # print(f'---入库时page_size={page_size}---')
         create_time = retData['create_time']
         order_by = num
-        # selects = self.secrchATT(item_id, year, type_id)
-        #
-        # if selects:
-        #     self.getLogger().info(f'com_name:{com_name}--{year}已存在')
-        #     id = ''
-        #     return id
-        # else:
+        selects = self.secrchATT(item_id, year, type_id,path)
 
-        Upsql = '''insert into clb_sys_attachment(year,name,type_id,item_id,group_name,path,full_path,category,file_size,order_by,status,create_by,create_time,page_size,object_key,bucket_name,publish_time) values(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)'''
+        if selects:
+            # self.getLogger().info(f'com_name:{com_name}--{year}已存在')
+            id = ''
+            return id
+        else:
 
-        values = (
-            year, pdf_name, type_id, item_id, group_name, path, full_path, category, file_size, order_by,
-            status, create_by,
-            create_time, page_size,full_path.split('https://zzsn.obs.cn-north-1.myhuaweicloud.com/')[1],'zzsn',pub_time)
+            Upsql = '''insert into clb_sys_attachment(year,name,type_id,item_id,group_name,path,full_path,category,file_size,order_by,status,create_by,create_time,page_size,object_key,bucket_name,publish_time) values(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)'''
 
-        self.cursor_.execute(Upsql, values)  # 插入
-        self.cnx_.commit()  # 提交
-        self.getLogger().info("更新完成:{}".format(Upsql))
+            values = (
+                year, pdf_name, type_id, item_id, group_name, path, full_path, category, file_size, order_by,
+                status, create_by,
+                create_time, page_size,full_path.split('https://zzsn.obs.cn-north-1.myhuaweicloud.com/')[1],'zzsn',pub_time)
 
-        selects = self.secrchATT(item_id, year, type_id,path)
-        id = selects[0]
-        print(f'获取的id为{id}')
-        return id
+            self.cursor_.execute(Upsql, values)  # 插入
+            self.cnx_.commit()  # 提交
+            self.getLogger().info("更新完成:{}".format(Upsql))
+
+            selects = self.secrchATT(item_id, year, type_id,path)
+            id = selects[0]
+            # print(f'获取的id为{id}')
+            return id
 
     # 更新企业的CIK
     def updateCIK(self, social_code, cik):