Skip to content

Z
zhichan
Commit 28c83c93 by 王昆
Options

gsb

parent 4a9870f1
Showing with 9 additions and 8 deletions
bpo-web/app/base/service/impl/dkcontractSve.js
...@@ -293,13 +293,13 @@ class DKcontractService extends ServiceBase { ...@@ -293,13 +293,13 @@ class DKcontractService extends ServiceBase {
console.log(fileRs, "==============================================================="); console.log(fileRs, "===============================================================");
if (fileRs.code == 1 && fileRs.data.selfossUrl) { if (fileRs.code == 1 && fileRs.data.selfossUrl) {
contract.fileurl = fileRs.data.selfossUrl; contract.fileurl = fileRs.data.selfossUrl;
contract.save(); await contract.save();
} else { } else {
await this.utilesignbaoSve.archiveProcess({flowId: contract.eflowid}, "econtractSve"); await this.utilesignbaoSve.archiveProcess({flowId: contract.eflowid}, "econtractSve");
let fileRs = await this.utilesignbaoSve.downloadUserContractFile(contract.eflowid, "econtractSve"); let fileRs = await this.utilesignbaoSve.downloadUserContractFile(contract.eflowid, "econtractSve");
if (fileRs.code == 1 && fileRs.data.selfossUrl) { if (fileRs.code == 1 && fileRs.data.selfossUrl) {
contract.fileurl = fileRs.data.selfossUrl; contract.fileurl = fileRs.data.selfossUrl;
contract.save(); await contract.save();
} }
} }
} }
...@@ -334,14 +334,14 @@ class DKcontractService extends ServiceBase { ...@@ -334,14 +334,14 @@ class DKcontractService extends ServiceBase {
if (fileRs.code == 1 && fileRs.data.selfossUrl) { if (fileRs.code == 1 && fileRs.data.selfossUrl) {
contract.fileurl = fileRs.data.selfossUrl; contract.fileurl = fileRs.data.selfossUrl;
await contract.save(); await contract.save();
this.syncYzSign(contract.id); // this.syncYzSign(contract.id);
} else { } else {
await this.utilesignbaoSve.archiveProcess({flowId: contract.eflowid}, "econtractSve"); await this.utilesignbaoSve.archiveProcess({flowId: contract.eflowid}, "econtractSve");
let fileRs = await this.utilesignbaoSve.downloadUserContractFile(contract.eflowid, "econtractSve"); let fileRs = await this.utilesignbaoSve.downloadUserContractFile(contract.eflowid, "econtractSve");
if (fileRs.code == 1 && fileRs.data.selfossUrl) { if (fileRs.code == 1 && fileRs.data.selfossUrl) {
contract.fileurl = fileRs.data.selfossUrl; contract.fileurl = fileRs.data.selfossUrl;
await contract.save(); await contract.save();
this.syncYzSign(contract.id); // this.syncYzSign(contract.id);
} }
} }
} catch (e) { } catch (e) {
...@@ -866,7 +866,8 @@ class DKcontractService extends ServiceBase { ...@@ -866,7 +866,8 @@ class DKcontractService extends ServiceBase {
let todays = moment().format("YYYY-MM-DD") + " 00:00:00"; let todays = moment().format("YYYY-MM-DD") + " 00:00:00";
let contractId = await this.dao.findSignedContractId({idno: eaccount.personsSign, ecid: ecid, today : todays}) || 0; let contractId = await this.dao.findSignedContractId({idno: eaccount.personsSign, ecid: ecid, today : todays}) || 0;
if (contractId) { if (contractId) {
return system.getResult2({contractId: contractId}, {}, "用户已签约"); let exists = await this.dao.findById(contractId);
return system.getResult2({contract: exists, params: params}, {}, "用户已签约");
} }
// ecid dketemplate // ecid dketemplate
......
bpo-web/app/base/service/impl/econtractSve.js
...@@ -2880,20 +2880,20 @@ class EcontractService extends ServiceBase { ...@@ -2880,20 +2880,20 @@ class EcontractService extends ServiceBase {
return ; return ;
} }
//await this.syncYzSign(2134); // await this.syncYzSign(2134);
// 请求文件地址 // 请求文件地址
let fileRs = await this.utilesignbaoSve.downloadUserContractFile(contract.eflowid, "econtractSve"); let fileRs = await this.utilesignbaoSve.downloadUserContractFile(contract.eflowid, "econtractSve");
if (fileRs.code == 1 && fileRs.data.selfossUrl) { if (fileRs.code == 1 && fileRs.data.selfossUrl) {
contract.fileurl = fileRs.data.selfossUrl; contract.fileurl = fileRs.data.selfossUrl;
await contract.save(); await contract.save();
this.syncYzSign(contract.id); // this.syncYzSign(contract.id);
} else { } else {
await this.utilesignbaoSve.archiveProcess({flowId: contract.eflowid}, "econtractSve"); await this.utilesignbaoSve.archiveProcess({flowId: contract.eflowid}, "econtractSve");
let fileRs = await this.utilesignbaoSve.downloadUserContractFile(contract.eflowid, "econtractSve"); let fileRs = await this.utilesignbaoSve.downloadUserContractFile(contract.eflowid, "econtractSve");
if (fileRs.code == 1 && fileRs.data.selfossUrl) { if (fileRs.code == 1 && fileRs.data.selfossUrl) {
contract.fileurl = fileRs.data.selfossUrl; contract.fileurl = fileRs.data.selfossUrl;
await contract.save(); await contract.save();
this.syncYzSign(contract.id); // this.syncYzSign(contract.id);
} }
} }
} catch (e) { } catch (e) {
......
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