Ver código fonte

Merge remote-tracking branch 'origin/master'

znj 4 meses atrás
pai
commit
b23457a0e3
1 arquivos alterados com 3 adições e 3 exclusões
  1. 3 3
      BaseDataMaintenance/maintenance/dataflow.py

+ 3 - 3
BaseDataMaintenance/maintenance/dataflow.py

@@ -3802,7 +3802,7 @@ class Dataflow_dumplicate(Dataflow):
                 list_dynamic = json.loads(_dynamic)
                 for _d in list_dynamic:
                     _title = _d.get("doctitle","")
-                    if re.search("验收公[示告]",_title) is not None:
+                    if re.search("验收公[示告]|验收结果",_title) is not None or _d.get("docchannel")==122:
                         is_yanshou = True
                         break
 
@@ -4401,7 +4401,7 @@ class Dataflow_dumplicate(Dataflow):
         list_dict = getRow_ots(rows)
 
         for item in list_dict:
-            self.dumplicate_comsumer_handle(item,None,self.ots_client,get_all=True,upgrade=False)
+            self.dumplicate_comsumer_handle(item,None,self.ots_client,get_all=True,upgrade=True)
             return
 
     def test_merge(self,list_docid_less,list_docid_greater):
@@ -4577,7 +4577,7 @@ if __name__ == '__main__':
     # test_attachment_interface()
     df_dump = Dataflow_dumplicate(start_delete_listener=False)
     # df_dump.start_flow_dumplicate()
-    df_dump.test_dumplicate(578681000
+    df_dump.test_dumplicate(583554643
                             )
     # compare_dumplicate_check()
     # df_dump.test_merge([391898061