Commit fafc3ad0 authored by Luochenglong's avatar Luochenglong

凭证取值调整

parent d06892e9
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
params: { params: {
record_id: record_id record_id: record_id
}, },
height: 350, height: 200,
width: 700 width: 1100
}); });
} }
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
params: { params: {
record_id: record_id record_id: record_id
}, },
height: 350, height: 550,
width: 700 width: 800
}); });
} }
......
...@@ -91,11 +91,11 @@ ...@@ -91,11 +91,11 @@
<a:dataSets> <a:dataSets>
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:grid id="att_para_ds_id" bindTarget="att_json_ds" height="180" width="760" navBar="true"> <a:grid id="att_para_ds_id" bindTarget="att_json_ds" height="180" width="1050" navBar="true">
<a:columns> <a:columns>
<a:column name="action_type" prompt="附件类型" width="150"/> <a:column name="action_type" prompt="附件类型" width="150"/>
<a:column name="code_value" prompt="附件地址" width="400"/> <a:column name="code_value" prompt="附件地址" width="650"/>
<a:column name="code_value_name" prompt="附件名称" width="200"/> <a:column name="code_value_name" prompt="附件名称" width="250"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
......
...@@ -76,10 +76,10 @@ ...@@ -76,10 +76,10 @@
<a:dataSets > <a:dataSets >
</a:dataSets> </a:dataSets>
<a:screenBody> <a:screenBody>
<a:grid id="post_stru_para_ds_id" bindTarget="post_stur_json_ds" marginHeight="200" width="355" navBar="true"> <a:grid id="post_stru_para_ds_id" bindTarget="post_stur_json_ds" marginHeight="480" width="740" navBar="true">
<a:columns> <a:columns>
<a:column name="code_value" prompt="字段代码" width="150"/> <a:column name="code_value" prompt="字段代码" width="150"/>
<a:column name="code_value_name" prompt="值内容" width="200"/> <a:column name="code_value_name" prompt="值内容" width="589"/>
</a:columns> </a:columns>
</a:grid> </a:grid>
</a:screenBody> </a:screenBody>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
var checkTokenQuery = check_token_valid_bm.queryAsMap(); var checkTokenQuery = check_token_valid_bm.queryAsMap();
var is_valid = checkTokenQuery.getChildren()[0].is_valid; var is_valid = checkTokenQuery.getChildren()[0].is_valid;
var fieldValueList_bm=$bm('efile.EFILE1040.efile_doc_import_query'); var fieldValueList_bm=$bm('efile.EFILE1040.efile_doc_import_query');
var je_data_json_bm=$bm('efile.EFILE1040.efile_journal_clob_query'); //var je_data_json_bm=$bm('efile.EFILE1040.efile_journal_clob_query');
var record=[]; var record=[];
var doc_data=[]; var doc_data=[];
var batch_num=0; var batch_num=0;
...@@ -52,22 +52,22 @@ ...@@ -52,22 +52,22 @@
var fieldValueList_data = fieldValueList_bm.queryAsMap({ var fieldValueList_data = fieldValueList_bm.queryAsMap({
pool_id: batch_data[i].pool_id pool_id: batch_data[i].pool_id
}); });
var je_data_json_data; // var je_data_json_data;
var je_json_data_result; // var je_json_data_result;
var je_json_data; // var je_json_data;
var je_json_data1; // var je_json_data1;
var je_json_data2; // var je_json_data2;
if(batch_data[i].je_check_flag=='Y'){ //if(batch_data[i].je_check_flag=='Y'){
je_data_json_data = je_data_json_bm.queryAsMap({ // je_data_json_data = je_data_json_bm.queryAsMap({
e_archives_id: batch_data[i].e_archives_id, // e_archives_id: batch_data[i].e_archives_id,
document_id: batch_data[i].document_id, // document_id: batch_data[i].document_id,
workflow_id: batch_data[i].workflow_id // workflow_id: batch_data[i].workflow_id
}); // });
je_json_data=je_data_json_data.getChildren()[0].je_data_json; // je_json_data=je_data_json_data.getChildren()[0].je_data_json;
je_json_data_result=JSON.parse(je_json_data); // je_json_data_result=JSON.parse(je_json_data);
je_json_data1=je_json_data_result[0]; // je_json_data1=je_json_data_result[0];
je_json_data2=je_json_data_result[1]; // je_json_data2=je_json_data_result[1];
} // }
var companyCode='HL'; var companyCode='HL';
var documentTypeCode=batch_data[i].base_archive_code; var documentTypeCode=batch_data[i].base_archive_code;
...@@ -85,21 +85,21 @@ ...@@ -85,21 +85,21 @@
if(typeof(fieldValueList)=="undefined"){ if(typeof(fieldValueList)=="undefined"){
fieldValueList=[]; fieldValueList=[];
if(batch_data[i].je_check_flag=='Y'){ // if(batch_data[i].je_check_flag=='Y'){
fieldValueList.push(je_json_data1); // fieldValueList.push(je_json_data1);
fieldValueList.push(je_json_data2); // fieldValueList.push(je_json_data2);
fieldValueList=JSON.stringify(fieldValueList); // fieldValueList=JSON.stringify(fieldValueList);
filelist.push(fieldValueList); // filelist.push(fieldValueList);
}else{ // }else{
filelist='[]' ; filelist='[]' ;
} //}
}else{ }else{
fieldValueList=fieldValueList.substring(17); fieldValueList=fieldValueList.substring(17);
fieldValueList=JSON.parse(fieldValueList); fieldValueList=JSON.parse(fieldValueList);
if(batch_data[i].je_check_flag=='Y'){ //if(batch_data[i].je_check_flag=='Y'){
fieldValueList.push(je_json_data1); //fieldValueList.push(je_json_data1);
fieldValueList.push(je_json_data2); // fieldValueList.push(je_json_data2);
} // }
fieldValueList=JSON.stringify(fieldValueList); fieldValueList=JSON.stringify(fieldValueList);
filelist.push(fieldValueList); filelist.push(fieldValueList);
} }
...@@ -133,7 +133,6 @@ ...@@ -133,7 +133,6 @@
doc_data.push(fils); doc_data.push(fils);
}else{ }else{
attachmentList=attachmentList.substring(17); attachmentList=attachmentList.substring(17);
logger.info(attachmentList);
attachmentList=JSON.parse(attachmentList); attachmentList=JSON.parse(attachmentList);
attachmentList=JSON.stringify(attachmentList); attachmentList=JSON.stringify(attachmentList);
attlist.push(attachmentList); attlist.push(attachmentList);
...@@ -166,7 +165,7 @@ ...@@ -166,7 +165,7 @@
if(doc_data.length==100||doc_data.length==batch_data.length){ if(doc_data.length==100||doc_data.length==batch_data.length){
batch_num++; batch_num++;
if (is_valid == 'true') { if (is_valid =='true') {
var SystokenQuery = token_savelogs_bm.queryAsMap(); var SystokenQuery = token_savelogs_bm.queryAsMap();
var access_token = SystokenQuery.getChildren()[0].access_token; var access_token = SystokenQuery.getChildren()[0].access_token;
var doc_data=JSON.stringify(doc_data); var doc_data=JSON.stringify(doc_data);
...@@ -312,32 +311,28 @@ ...@@ -312,32 +311,28 @@
}else{ }else{
for(var i=0;i<req_date.length;i++){ for(var i=0;i<req_date.length;i++){
var fieldValueList_data = fieldValueList_bm.queryAsMap({ var fieldValueList_data = fieldValueList_bm.queryAsMap({
pool_id: req_date[i].pool_id pool_id: req_date[i].pool_id
}); });
var je_data_json_data; // var je_data_json_data;
var je_json_data_result; // var je_json_data_result;
var je_json_data; // var je_json_data;
var je_json_data1; // var je_json_data1;
var je_json_data2; // var je_json_data2;
if(req_date[i].je_check_flag=='Y'){ // if(req_date[i].je_check_flag=='Y'){
je_data_json_data = je_data_json_bm.queryAsMap({ // je_data_json_data = je_data_json_bm.queryAsMap({
e_archives_id: req_date[i].e_archives_id, // e_archives_id: req_date[i].e_archives_id,
document_id: req_date[i].document_id, // document_id: req_date[i].document_id,
workflow_id: req_date[i].workflow_id // workflow_id: req_date[i].workflow_id
}); // });
je_json_data=je_data_json_data.getChildren()[0].je_data_json; // je_json_data=je_data_json_data.getChildren()[0].je_data_json;
logger.info(je_json_data); // je_json_data_result=JSON.parse(je_json_data);
je_json_data_result=JSON.parse(je_json_data); // je_json_data1=je_json_data_result[0];
logger.info(je_json_data_result[0]); // je_json_data2=je_json_data_result[1];
je_json_data1=je_json_data_result[0]; // }
logger.info(je_json_data_result[1]);
je_json_data2=je_json_data_result[1];
}
var companyCode='HL'; var companyCode='HL';
var documentTypeCode=req_date[i].base_archive_code; var documentTypeCode=req_date[i].base_archive_code;
...@@ -354,24 +349,23 @@ ...@@ -354,24 +349,23 @@
if(typeof(fieldValueList)=="undefined"){ if(typeof(fieldValueList)=="undefined"){
fieldValueList=[]; fieldValueList=[];
if(req_date[i].je_check_flag=='Y'){ //if(req_date[i].je_check_flag=='Y'){
fieldValueList.push(je_json_data1); //fieldValueList.push(je_json_data1);
fieldValueList.push(je_json_data2); //fieldValueList.push(je_json_data2);
fieldValueList=JSON.stringify(fieldValueList); //fieldValueList=JSON.stringify(fieldValueList);
filelist.push(fieldValueList); // filelist.push(fieldValueList);
}else{ //}else{
filelist='[]' ; filelist='[]' ;
} // }
}else{ }else{
fieldValueList=fieldValueList.substring(17); fieldValueList=fieldValueList.substring(17);
fieldValueList=JSON.parse(fieldValueList); fieldValueList=JSON.parse(fieldValueList);
if(req_date[i].je_check_flag=='Y'){ //if(req_date[i].je_check_flag=='Y'){
fieldValueList.push(je_json_data1); //fieldValueList.push(je_json_data1);
fieldValueList.push(je_json_data2); // fieldValueList.push(je_json_data2);
} // }
fieldValueList=JSON.stringify(fieldValueList); fieldValueList=JSON.stringify(fieldValueList);
filelist.push(fieldValueList); filelist.push(fieldValueList);
logger.info(filelist);
} }
...@@ -508,7 +502,6 @@ ...@@ -508,7 +502,6 @@
var json_data = JSON.parse(data_result); var json_data = JSON.parse(data_result);
var statusCode =json_data.statusCode; var statusCode =json_data.statusCode;
var message =json_data.message; var message =json_data.message;
logger.info(statusCode);
var doc_import_return_bm = $bm('efile.EFILE1040.doc_import_return'); var doc_import_return_bm = $bm('efile.EFILE1040.doc_import_return');
if(statusCode=='0000'){ if(statusCode=='0000'){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment