cf502dfa by 周伟奇

fix gcap

1 parent c25ced3c
...@@ -17,7 +17,7 @@ SPLIT_STR = '_' ...@@ -17,7 +17,7 @@ SPLIT_STR = '_'
17 BUSINESS_TYPE_LIST = [HIL_PREFIX, AFC_PREFIX] 17 BUSINESS_TYPE_LIST = [HIL_PREFIX, AFC_PREFIX]
18 HIL_SET = {'HIL', 'HIl', 'HiL', 'Hil', 'hIL', 'hIl', 'hiL', 'hil', 'CO00002'} 18 HIL_SET = {'HIL', 'HIl', 'HiL', 'Hil', 'hIL', 'hIl', 'hiL', 'hil', 'CO00002'}
19 19
20 PRIORITY_WORDS = {'muw', 'MUW'} 20 PRIORITY_WORDS = {'muw', 'MUW', '42', 42}
21 TMP_DIR_NAME = 'tmp' 21 TMP_DIR_NAME = 'tmp'
22 22
23 # -------EDMS相关--------------------------------------------------------------------------------------------------- 23 # -------EDMS相关---------------------------------------------------------------------------------------------------
......
...@@ -81,11 +81,12 @@ application_information = { ...@@ -81,11 +81,12 @@ application_information = {
81 "RATING": fields.Int(required=True), 81 "RATING": fields.Int(required=True),
82 "APPLICATION_ID": fields.Str(required=True, validate=validate.Length(max=100)), 82 "APPLICATION_ID": fields.Str(required=True, validate=validate.Length(max=100)),
83 "APPLICATION_VERSION": fields.Int(required=True), 83 "APPLICATION_VERSION": fields.Int(required=True),
84 "INTERMEDIATE_DECISION": fields.Str(required=True, validate=validate.Length(max=100)), 84 "INTERMEDIATE_DECISION": fields.Int(required=True),
85 } 85 }
86 86
87 priority_doc_args = { 87 priority_doc_args = {
88 'APPLICATION_INFORMATION': fields.Nested(application_information, required=True) 88 'APPLICATION_INFORMATION': fields.Nested(application_information, required=True)
89
89 } 90 }
90 91
91 92
...@@ -185,7 +186,7 @@ class PriorityDocView(GenericView, DocHandler): ...@@ -185,7 +186,7 @@ class PriorityDocView(GenericView, DocHandler):
185 application_info = args.get('APPLICATION_INFORMATION') 186 application_info = args.get('APPLICATION_INFORMATION')
186 application_id = application_info.get('APPLICATION_ID') 187 application_id = application_info.get('APPLICATION_ID')
187 submit_datetime = application_info.get('SUBMIT_DATETIME') 188 submit_datetime = application_info.get('SUBMIT_DATETIME')
188 intermediate_decision = application_info.get('INTERMEDIATE_DECISION') 189 intermediate_decision = str(application_info.get('INTERMEDIATE_DECISION'))
189 entity = application_info.get('ENTITY') 190 entity = application_info.get('ENTITY')
190 if submit_datetime.utcoffset() is not None: 191 if submit_datetime.utcoffset() is not None:
191 submit_datetime = timezone.make_naive(submit_datetime, timezone.get_current_timezone()) 192 submit_datetime = timezone.make_naive(submit_datetime, timezone.get_current_timezone())
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!