init 5131-5234

@@ -1134,7 +1134,16 @@ class DealerMapping(models.Model):
 
 
 class HILGreenBookHistoryFile(models.Model):
 class HILGreenBookHistoryFile(models.Model):
     id = models.AutoField(primary_key=True, verbose_name="id")  # 主键
     id = models.AutoField(primary_key=True, verbose_name="id")  # 主键
-    application_id = models.CharField(max_length=64, verbose_name="申请id")  # 索引
+    object_id = models.CharField(max_length=64, verbose_name="文件唯一ID")
+    object_name = models.CharField(max_length=255, verbose_name="文件名称")
+    application_no = models.CharField(max_length=64, verbose_name="申请号")
+    object_type = models.CharField(max_length=64, verbose_name="文件类型")
+    customer_name = models.CharField(max_length=64, verbose_name="customer_name")
+    content_size = models.CharField(max_length=64, verbose_name="文件大小")
+    owner_name = models.CharField(max_length=64, verbose_name="owner_name")
+    input_date = models.DateTimeField(verbose_name="上传时间")
+    modify_date = models.DateTimeField(verbose_name="修改时间")
+    location = models.CharField(max_length=255, verbose_name="文件位置")
     download_finish = models.BooleanField(default=True, verbose_name="是否下载完成")
     download_finish = models.BooleanField(default=True, verbose_name="是否下载完成")
     update_time = models.DateTimeField(auto_now=True, verbose_name='修改时间')
     update_time = models.DateTimeField(auto_now=True, verbose_name='修改时间')
     create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
     create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
@@ -1146,7 +1155,16 @@ class HILGreenBookHistoryFile(models.Model):
 
 
 class AFCGreenBookHistoryFile(models.Model):
 class AFCGreenBookHistoryFile(models.Model):
     id = models.AutoField(primary_key=True, verbose_name="id")  # 主键
     id = models.AutoField(primary_key=True, verbose_name="id")  # 主键
-    application_id = models.CharField(max_length=64, verbose_name="申请id")  # 索引
+    object_id = models.CharField(max_length=64, verbose_name="文件唯一ID")
+    object_name = models.CharField(max_length=255, verbose_name="文件名称")
+    application_no = models.CharField(max_length=64, verbose_name="申请号")
+    object_type = models.CharField(max_length=64, verbose_name="文件类型")
+    customer_name = models.CharField(max_length=64, verbose_name="customer_name")
+    content_size = models.CharField(max_length=64, verbose_name="文件大小")
+    owner_name = models.CharField(max_length=64, verbose_name="owner_name")
+    input_date = models.DateTimeField(verbose_name="上传时间")
+    modify_date = models.DateTimeField(verbose_name="修改时间")
+    location = models.CharField(max_length=255, verbose_name="文件位置")
     download_finish = models.BooleanField(default=True, verbose_name="是否下载完成")
     download_finish = models.BooleanField(default=True, verbose_name="是否下载完成")
     update_time = models.DateTimeField(auto_now=True, verbose_name='修改时间')
     update_time = models.DateTimeField(auto_now=True, verbose_name='修改时间')
     create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')
     create_time = models.DateTimeField(auto_now_add=True, verbose_name='创建时间')

@@ -170,7 +170,7 @@ class ECM(GenericView):
             "password": self.pwd,
             "password": self.pwd,
             "docbase": self.doc_base_map.get(business_type),
             "docbase": self.doc_base_map.get(business_type),
             "documentType": "green_book",
             "documentType": "green_book",
-            "dql":"select r_object_id, object_name,b_application_no, r_object_type,b_customer_name,r_content_size, owner_name, b_input_date, r_modify_date, b_location from green_book where b_location = '"+ filePath +"' order by r_modify_date desc"
+            "dql":"select r_object_id, object_name,b_application_no, r_object_type,b_customer_name,r_content_size, owner_name, b_input_date, r_modify_date, b_location from green_book where b_location = '"+ filePath +"'"
         }
         }
         header_info = self.get_headers()
         header_info = self.get_headers()
         self.running_log.info("{0} search header_info:{1}".format(self.log_base, header_info))
         self.running_log.info("{0} search header_info:{1}".format(self.log_base, header_info))

@@ -1904,7 +1904,16 @@ class SearchGBHistoryFileView(GenericView):
                 properties_dict[name] = value
                 properties_dict[name] = value
             self.running_log.info('[SearchGBHistoryFileView] [properties_dict={0}] '.format(properties_dict))
             self.running_log.info('[SearchGBHistoryFileView] [properties_dict={0}] '.format(properties_dict))
             gb_history_file_class.objects.create(
             gb_history_file_class.objects.create(
-                    application_id=properties_dict['b_application_no'],
+                    object_id=object_id,
+                    object_name=properties_dict.get('object_name', ''),
+                    application_no=properties_dict.get('b_application_no', ''),
+                    object_type=properties_dict.get('r_object_type', ''),
+                    customer_name=properties_dict.get('b_customer_name', ''),
+                    content_size=properties_dict.get('r_content_size', ''),
+                    owner_name=properties_dict.get('owner_name', ''),
+                    #input_date=properties_dict.get('b_input_date', ''),
+                    #modify_date=properties_dict.get('r_modify_date', ''),
+                    location=properties_dict.get('b_location', ''),
                     download_finish=False
                     download_finish=False
                 )
                 )
         return response.ok(data=False)
         return response.ok(data=False)
@@ -1916,13 +1925,10 @@ class DownloadGBHistoryFileView(GenericView):
     @use_args(employee_args, location='data')
     @use_args(employee_args, location='data')
     def post(self, request, args): 
     def post(self, request, args): 
         
         
-        filePath = args.get('filePath')
         business_type = args.get('business_type')
         business_type = args.get('business_type')
+        object_id = args.get('object_id')
+        save_path = args.get('save_path')
         ecm = ECM()
         ecm = ECM()
-        ecm.download(filePath, business_type)
-        gb_history_file_class = HILGreenBookHistoryFile if business_type in consts.HIL_SET else AFCGreenBookHistoryFile
-        gb_history_file_class.objects.create(
-                    application_id=gb_history_file_class.application_id,
-                    download_finish=False
-                )
+        ecm.download(save_path, object_id, 'green_book', business_type)
+        self.running_log.info('[DownloadGBHistoryFileView] [args={0}] '.format(args))
         return response.ok(data=False)
         return response.ok(data=False)
\ No newline at end of file