Merge branch 'master' of http://192.168.2.103:3000/luojiehua/BaseDataMaintenance

 Conflicts:

	BaseDataMaintenance/maintenance/dataflow.py

BaseDataMaintenance/maintenance/dataflow.py

@@ -2374,6 +2374,7 @@ class Dataflow_dumplicate(Dataflow):
         approval_greater = document_greater.get("approval",[])
         source_type_greater = document_greater.get("source_type")
 
+
         hard_level=1
         if docchannel_less==docchannel_greater==302:
             hard_level=2

BaseDataMaintenance/maintenance/major_project/unionDocument.py

@@ -307,10 +307,13 @@ class MajorUnion():
 
 
     def producer(self):
+        _time = getCurrent_date(format="%Y-%m-%d %H:%M:%S")
+        end_time = timeAdd(_time,days=-7,format="%Y-%m-%d %H:%M:%S")
         bool_query = BoolQuery(must_queries=[
-            RangeQuery(major_project_status,1,50,True,True),
+            # RangeQuery(major_project_status,1,50,True,True),
             # RangeQuery(major_project_status,201,301,True,True),
             # TermQuery(major_project_id,"00048953975ad762e883f1626f6b99ec")
+            RangeQuery(major_project_update_time,range_to=end_time)
             ]
         )
 
@@ -367,6 +370,7 @@ class MajorUnion():
 
             #修改status
             self.set_status_to_adult(_major)
+            _major.setValue(major_project_update_time,getCurrent_date(format="%Y-%m-%d %H:%M:%S"),True)
             _major.update_row(self.ots_client)
             return