Skip to content

L
leaf-hlcm
Commit 1cbd732a authored by congzhao's avatar congzhao
Browse files
Options

[建机]电子合同开发 提前结清发起流程，查询接口，业务系统改造 11.25

parent aef1f821
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 276 additions and 105 deletions
src/main/webapp/WEB-INF/classes/cont/CON505/contract_sign_cancel.lwm
View file @ 1cbd732a
......@@ -33,6 +33,9 @@
c.last_update_date = sysdate,
c.last_updated_by = ${/session/@user_id}
where c.contract_id = ${@contract_id};
delete from con_contract_ele_signer cs where cs.contract_id = ${@contract_id};
commit;
end;
]]></bm:update-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_ele_contract_signer_save.lwm
View file @ 1cbd732a
......@@ -9,6 +9,7 @@
<bm:fields>
<bm:field name="con_ele_signer_id"/>
<bm:field name="contract_id"/>
<bm:field name="contract_number"/>
<bm:field name="bp_id"/>
<bm:field name="bp_name"/>
<bm:field name="id_type"/>
......@@ -26,24 +27,29 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from (select cs.con_ele_signer_id,
cs.contract_id,
cs.bp_id,
cs.bp_name,
cs.id_type,
cs.id_no,
cs.templet_signer_id,
cs.ec_sign_status,
hs.templet_id,
hs.indentity_type,
hs.key_word,
nvl(hs.auto_sign,'N') auto_sign,
hs.sign_order,
hs.sign_type,
hs.signer_category
from con_contract_ele_signer cs, hls_doc_file_templet_signer hs
where cs.templet_signer_id = hs.templet_signer_id
and cs.esign_type = 'CE') t
select *
from (select cs.con_ele_signer_id,
(select cc.contract_number
from con_contract cc
where cc.contract_id = cs.contract_id
and cc.data_class = 'NORMAL') contract_number,
cs.contract_id,
cs.bp_id,
cs.bp_name,
cs.id_type,
cs.id_no,
cs.templet_signer_id,
cs.ec_sign_status,
hs.templet_id,
hs.indentity_type,
hs.key_word,
nvl(hs.auto_sign, 'N') auto_sign,
hs.sign_order,
hs.sign_type,
hs.signer_category
from con_contract_ele_signer cs, hls_doc_file_templet_signer hs
where cs.templet_signer_id = hs.templet_signer_id
and cs.esign_type = 'CE') t
#WHERE_CLAUSE#
]]></bm:query-sql>
</bm:operation>
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_ele_signer_status_update.lwm
View file @ 1cbd732a
......@@ -16,7 +16,8 @@
update con_contract cc
set cc.ec_sign_type = 'SIGNING',
cc.last_update_date = sysdate
where cc.ele_flow_id = ${@flow_id};
where cc.ele_flow_id = ${@flow_id}
and cc.ec_sign_type != 'SIGNED';
END;
]]></bm:update-sql>
</bm:operation>
......@@ -31,6 +32,12 @@
cc.last_update_date = sysdate
where cc.ele_flow_id = ${@flow_id}
and cc.contract_id = ${@contract_id};
update con_contract_ele_signer cs
set cs.ec_sign_status = 'Y',
cs.last_update_date = sysdate
where cs.contract_id = ${@contract_id};
wx_ele_contract_pkg.downloadEleFile(p_contract_id => ${@contract_id},
p_ele_flow_id => ${@flow_id},
p_user_id => 1,
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_ele_unsigned_file_query.lwm
View file @ 1cbd732a
......@@ -14,16 +14,19 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select fa.file_name,fa.file_path,fa.file_size
from fnd_atm_attachment fa, fnd_atm_attachment_multi fm
select fa.file_name,fa.file_path,fa.file_size,ct.order_seq
from fnd_atm_attachment fa, fnd_atm_attachment_multi fm,con_contract_content cc,con_clause_templet ct
where fa.attachment_id = fm.attachment_id
and fm.table_name = 'CON_CONTRACT_CONTENT'
and cc.content_id = fm.table_pk_value
and cc.templet_id = ct.templet_id
and fm.table_pk_value in
(select t.content_id
from con_contract_content t,con_ele_signer_file cf
where t.contract_id = ${@contract_id}
and t.templet_id = cf.templet_id
and cf.templet_code ！= 'SETTLE_ADVANCE_OEC')
and cf.templet_code != 'SETTLE_ADVANCE_OEC')
order by ct.order_seq
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_et_contract_signer_save.lwm
View file @ 1cbd732a
......@@ -8,6 +8,7 @@
<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
<bm:fields>
<bm:field name="con_ele_signer_id"/>
<bm:field name="contract_number"/>
<bm:field name="contract_id"/>
<bm:field name="bp_id"/>
<bm:field name="bp_name"/>
......@@ -27,6 +28,10 @@
<bm:operation name="query">
<bm:query-sql><![CDATA[
select * from (select cs.con_ele_signer_id,
(select cc.contract_number
from con_contract cc
where cc.contract_id = cs.contract_id
and cc.data_class = 'NORMAL') contract_number,
cs.contract_id,
cs.bp_id,
cs.bp_name,
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_et_signer_status_update.lwm
View file @ 1cbd732a
......@@ -16,7 +16,8 @@
update con_contract_change_req cc
set cc.ec_sign_type = 'SIGNING',
cc.last_update_date = sysdate
where cc.ele_flow_id = ${@flow_id};
where cc.ele_flow_id = ${@flow_id}
and cc.ec_sign_type != 'SIGNED';
END;
]]></bm:update-sql>
</bm:operation>
......@@ -30,6 +31,12 @@
cc.last_update_date = sysdate
where cc.ele_flow_id = ${@flow_id}
and cc.contract_id = ${@contract_id};
update con_contract_ele_signer cs
set cs.ec_sign_status = 'Y',
cs.last_update_date = sysdate
where cs.contract_id = ${@contract_id};
wx_ele_contract_pkg.downloadEleFile(p_contract_id => ${@contract_id},
p_ele_flow_id => ${@flow_id},
p_user_id => 1,
......
src/main/webapp/WEB-INF/classes/wx/WX100/con_et_unsigned_file_query.lwm
View file @ 1cbd732a
......@@ -14,16 +14,19 @@
<bm:operations>
<bm:operation name="query">
<bm:query-sql><![CDATA[
select fa.file_name,fa.file_path,fa.file_size
from fnd_atm_attachment fa, fnd_atm_attachment_multi fm
select fa.file_name,fa.file_path,fa.file_size,ct.order_seq
from fnd_atm_attachment fa, fnd_atm_attachment_multi fm,con_contract_content cc,con_clause_templet ct
where fa.attachment_id = fm.attachment_id
and fm.table_name = 'CON_CONTRACT_CONTENT'
and cc.content_id = fm.table_pk_value
and cc.templet_id = ct.templet_id
and fm.table_pk_value in
(select t.content_id
from con_contract_content t,con_ele_signer_file cf
where t.contract_id = ${@contract_id}
and t.templet_id = cf.templet_id
and cf.templet_code = 'SETTLE_ADVANCE_OEC')
order by ct.order_seq
]]></bm:query-sql>
</bm:operation>
</bm:operations>
......
src/main/webapp/WEB-INF/classes/wx/WX100/wx_ele_file_email.lwm
View file @ 1cbd732a
......@@ -6,6 +6,7 @@
BEGIN
wx_ele_contract_pkg.send_email(p_user_id => nvl(${/session/@user_id},1),
p_mail_to => ${@mail_to},
p_id_no => ${@id_no},
p_contract_id => ${@contract_id});
END;
]]></bm:update-sql>
......
src/main/webapp/modules/cont/CON311/con_re_print_entrance.lview
View file @ 1cbd732a
......@@ -56,6 +56,8 @@
else{
param['function_code'] = 'CON301';
param['function_usage'] = 'QUERY';
//add by 24976
param['sign_contract_status'] = record.get('sign_contract_status');
}
param['winid'] = 'con_contract_modify_win_id';
param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
......
src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview
View file @ 1cbd732a
......@@ -141,7 +141,7 @@
} else if (name == 'attachment') {
link_function = '${/parameter/@layout_code}_prj500_cdd_attachtment_upload';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.ds.id + '\',\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
} else if (name == 'attach_file_name' || name == 'attach_file_name_print' ) {
} else if (name == 'attach_file_name' || name == 'attach_file_name_print' || name == 'attachment_new') {
var content_type = record.get('content_type');
var content_id = record.get('content_id');
//电子合同
......@@ -160,10 +160,10 @@
if (!Leaf.isEmpty(temp[0])) {
var file_name = temp[0].toUpperCase();
var file_suffix = temp[0].substr(temp[0].lastIndexOf('.') + 1).toUpperCase();
// if (file_name.indexOf('.PDF') >= 0) {
// url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
// } else
if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
// if (file_name.indexOf('.PDF') >= 0) {
// url = url + '<a href=javascript:view_pdf(\'' + temp[1] + '\')>' + temp[0] + '</a>' + ',';
// } else
if (file_suffix == 'BMP' || file_suffix == 'JPG' || file_suffix == 'JPEG' || file_suffix == 'PNG' || file_suffix == 'GIF') {
url = url + '<a href=' + link + temp[1] + ' ref="img">' + temp[0] + '</a>' + ',';
} else {
url = url + '<a href=' + link + temp[1] + '>' + temp[0] + '</a>' + ',';
......@@ -180,6 +180,9 @@
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.ds.id + '\',\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + Leaf.formatMoney(value) + '</a>';
}
return '';
} else if (name == 'attach_file_name_new') {
link_function = '${/parameter/@layout_code}_prj500_cdd_attachtment_new_upload';
return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.ds.id + '\',\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
}
};
......@@ -312,6 +315,32 @@
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
}
};
//add by 24976
window['${/parameter/@layout_code}_prj500_cdd_attachtment_new_upload'] = function (ds_id, id, name, query_only) {
var record = $(ds_id).findById(id);
if (record.get('check_id')) {
var url;
//add by lijingjing 2019-11-15
if (query_only == 'Y' || '${/parameter/@download}' == 'Y') {
url = $('${/parameter/@layout_code}_prj500_cdd_downloadFile_id').getUrl() + '?table_name=CON_CONTRACT&header_id=' + record.get('check_id');
} else {
url = $('${/parameter/@layout_code}_prj500_cdd_uploadFile_id').getUrl() + '?table_name=CON_CONTRACT&header_id=' + record.get('check_id');
}
var win = new Leaf.Window({
url: url,
title: '${l:HLS.SUPPORTING_DOCUMENT}',
id: '${/parameter/@layout_code}${/parameter/@tree_code}_prj500_cdd_uploadFile_screen_id',
width: 850,
height: 400
});
win.on('close', function () {
record.ds.query();
});
} else {
Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
}
};
window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
//
var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
......@@ -469,13 +498,13 @@
window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function(ds, qpara, bp_seq) {
// var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_bs_score');
// if (ds == $(ds_id)) {
// var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_bs_score');
// if (ds == $(ds_id)) {
// qpara.contract_id = '${/parameter/@contract_id}';
// qpara.contract_id = '${/parameter/@contract_id}';
//$(ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
// }
//$(ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
// }
};
window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () {
......
src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
View file @ 1cbd732a
......@@ -300,7 +300,7 @@
var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
var req_record = $(req_ds_id).getAt(0);
var req_status = req_record.get('req_status');
var contact_id = req_record.get('contact_id');
var contract_id = req_record.get('contract_id');
if (req_status != 'NEW') {
Leaf.showMessage('${l:PROMPT}', '只有新建状态的才能发起电子签约');
return;
......@@ -311,7 +311,7 @@
Leaf.request({
url: $('${/parameter/@layout_code}_con_ele_terminate_create_link_id').getUrl(),
para: {
contract_id: contact_id
contract_id: contract_id
},
success: function(res) {
window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
......
src/main/webapp/modules/wx/WX100/con_contract_query.lsc
View file @ 1cbd732a
......@@ -69,6 +69,7 @@
"totalTimes": contract_list_detail.lease_times,
"signAmt": contract_list_detail.total_sign,
"signUrl":contract_list_detail.sign_url,
"userSignStatus":contract_list_detail.userSignStatus,
"signFiles": signFiles
});
}
......
src/main/webapp/modules/wx/WX100/con_ele_content_create.lsc
View file @ 1cbd732a
......@@ -239,6 +239,7 @@
contract_id: $ctx.parameter.contract_id
});
var ele_contract_signer_data = ele_contract_signer_map.getChildren();
var contract_number = ele_contract_signer_data[0].contract_number;
for (var k = 0 ; k < ele_contract_signer_data.length;k++){
var signerFileList = [];
var signer_record_data = ele_contract_signer_data[k];
......@@ -273,6 +274,7 @@
var httpUrl = info.code_value;
var signParam = {
contractNo:$ctx.parameter.contract_id,
contractNumber:contract_number,
esignType:"CE",
userInfo:userInfoList,
conFileList:conFileList,
......@@ -300,7 +302,8 @@
if (result_ob.code != 0) {
//rollback
$bm('wx.WX100.rollback').update();
raise_app_error('发起签约失败，请联系技术人员检查！');
//raise_app_error('发起签约失败，请联系技术人员检查！');
raise_app_error(result_ob.message.toString());
}else if(result_ob.code == 0){
var flow_id = result_ob.flowId;
var flow_update_bm = $bm('wx.WX100.con_ele_flow_update');
......
src/main/webapp/modules/wx/WX100/con_ele_sign_status_update.lsc
View file @ 1cbd732a
......@@ -27,7 +27,7 @@
signer_status_update_bm = $bm('wx.WX100.con_et_signer_status_update');
}
//个人签署完成
if ($ctx.parameter.action == 'SIGN_FLOW_UPDATE'){
if ($ctx.parameter.action == 'SIGN_FLOW_UPDATE' && $ctx.parameter.signResult == '2'){
var idNos = $ctx.parameter.idNos;
var idNos_json = JSON.parse(idNos);
var idNos_list = idNos_json.idNoList;
......@@ -44,7 +44,7 @@
$ctx.parameter.return_message = '修改成功';
}
//合同签署完成
else if($ctx.parameter.action == 'SIGN_FLOW_FINISH'){
else if($ctx.parameter.action == 'SIGN_FLOW_FINISH' && $ctx.parameter.flowStatus == '2'){
signer_status_update_bm.insert({
contract_id:contract_no,
flow_id:$ctx.parameter.flowId,
......
src/main/webapp/modules/wx/WX100/con_ele_terminate_create.lsc
View file @ 1cbd732a
......@@ -203,6 +203,7 @@
contract_id: $ctx.parameter.contract_id
});
var ele_contract_signer_data = ele_contract_signer_map.getChildren();
var contract_number = ele_contract_signer_data[0].contract_number;
for (var k = 0 ; k < ele_contract_signer_data.length;k++){
var signerFileList = [];
var signer_record_data = ele_contract_signer_data[k];
......@@ -237,6 +238,7 @@
var httpUrl = info.code_value;
var signParam = {
contractNo:$ctx.parameter.contract_id,
contractNumber:contract_number,
esignType:"ET",
userInfo:userInfoList,
conFileList:conFileList,
......@@ -262,7 +264,8 @@
if (result_ob.code != 0) {
//rollback
$bm('wx.WX100.rollback').update();
raise_app_error('发起签约失败，请联系技术人员检查！');
//raise_app_error('发起签约失败，请联系技术人员检查！');
raise_app_error(result_ob.message.toString());
}else if(result_ob.code == 0){
var flow_id = result_ob.flowId;
var flow_update_bm = $bm('wx.WX100.con_et_flow_update');
......
src/main/webapp/modules/wx/WX100/wx_ele_file_email.lsc
View file @ 1cbd732a
......@@ -4,11 +4,12 @@
<s:server-script import="app/app_login_check.js"><![CDATA[
function send_email() {
try {
if($ctx.parameter.email && $ctx.parameter.contractNo) {
if($ctx.parameter.email && $ctx.parameter.contractNo && $ctx.parameter.idNo) {
var ele_file_email_bm = $bm('wx.WX100.wx_ele_file_email');
ele_file_email_bm.insert({
mail_to: $ctx.parameter.email,
contract_id:$ctx.parameter.contractNo
contract_id:$ctx.parameter.contractNo,
id_no:$ctx.parameter.idNo
});
$ctx.parameter.return_status = '0';
$ctx.parameter.return_message = '执行成功';
......@@ -20,7 +21,7 @@ function send_email() {
}
var result = {
code: $ctx.parameter.return_status,
message: $ctx.parameter.return_message,
message: $ctx.parameter.return_message
};
$ctx.parameter.json = JSON.stringify(result);
......
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