Merge branch 'bpo-web' of http://gitlab.gongsibao.com/jiangyong/zhichan into bpo-web

76dfee3a · DESKTOP-7Q3CA17\86137 · 6a5e8621 · fc6d0fc7 · 76dfee3a · 76dfee3a
Commit 76dfee3a authored Sep 22, 2020 by $DESKTOP-7Q3CA17\86137's avatar$ DESKTOP-7Q3CA17\86137
5 changed files
--- a/bpo-web/app/base/api/impl/xbgApi.js
+++ b/bpo-web/app/base/api/impl/xbgApi.js
@@ -10,7 +10,11 @@ class XbgApi extends apiBase{
        this.econtractSve = system.getObject("service.econtractSve");
        this.esettleSve = system.getObject("service.esettleSve");
        this.etemplatebusiSve = system.getObject("service.etemplatebusiSve");
+        this.etemplatebusiSve = system.getObject("service.etemplatebusiSve");
        this.excelClient = system.getObject("util.excelClient");
+        this.dkcontractSve = system.getObject("service.dkcontractSve");
    }
    //合同模板
@@ -50,7 +54,7 @@ class XbgApi extends apiBase{
    }
-    async acontracttoMtchIdList(qobj) {
+    async acontracttoMtchIdList_old(qobj) {
        try {
            var params = qobj || {};
            var eteids = await this.etemplatebusiSve.geteteIds(params.mtchId);
@@ -69,30 +73,66 @@ class XbgApi extends apiBase{
        }
    }
+    async acontracttoMtchIdList(qobj) {
+        try {
+            let params = qobj || {};
+            let bList = await this.etemplatebusiSve.byBusiId(params.mtchId);
+            if (!bList || bList.length == 0) {
+                return system.getResult2({count: 0, rows: []});
+            }
-    //已签合同导出
+            let zIds = [];  // 专票末班id
+            let pIds = [];  // 普票模板id
+            for (let busi of bList) {
+                if (busi.template_type == 1) {
+                    zIds.push(busi.template_id);
+                } else {
+                    pIds.push(busi.template_id);
+                }
+            }
-    async allExport(qobj) {
+            if(zIds.length > 0){
-        var params = qobj || {};
+                params.etemplateIds = zIds;
-        params.currentPage = 1;
+                params.eflowstatusList = ['2'];
-        params.pageSize = 60000;
+                this.doTimeCondition(params, ["signBegin", "signEnd"]);
-        var eteids = await this.etemplatebusiSve.geteteIds(params.mtchId);
+                let page = await this.econtractSve.pageByCondition(params);
-        if(eteids.length > 0){
+                return system.getResult2(page);
-            params.etemplateIds = eteids;
+            }
-        }else {
-            return system.getErrResult2("导出失败");
+            if (pIds.length > 0) {
-        }
+                params.dktemplateIds = pIds;
-        params.eflowstatusList = ['2'];
+                params.eflowstatusList = ['2'];
-        this.doTimeCondition(params, ["signBegin", "signEnd"]);
+                this.doTimeCondition(params, ["signBegin", "signEnd"]);
-        try {
+                let page = await this.dkcontractSve.pageByCondition(params);
-            return await this.econtractSve.pageByCondition(params);
+                // 处理一下狗屎
+                if (page && page.rows) {
+                    for (let row of page.rows) {
+                        row.template_type = 2;
+                        row.etemplate_id = row.dktemplate_id;
+                        row.ecompany_id = row.dkcompany_id;
+                        row.ecompany = row.dkcompany;
+                        row.template = {
+                            id: 10233,
+                        }
+                    }
+                }
+                return system.getResult2(page);
+            }
        } catch (e) {
            console.log(e);
-            return system.getErrResult2("您的网络不稳, 请稍后重试");
+            return system.getErrResult2("接口异常");
        }
    }
+    //已签合同导出
+    async allExport(qobj) {
+        var params = qobj || {};
+        params.currentPage = 1;
+        params.pageSize = 60000;
+        let res = await this.acontracttoMtchIdList(params);
+        return res.data;
+    }
    //纳税人人员
    async ratepayingListToPe(qobj) {

--- a/bpo-web/app/base/service/impl/dkcontractSve.js
+++ b/bpo-web/app/base/service/impl/dkcontractSve.js
@@ -78,21 +78,26 @@ class DKcontractService extends ServiceBase {
        var where = {};
-        if (params.ecompanyIds) {
+        if (params.dkcompanyIds) {
-            where.ecompany_id = {
+            where.dkcompany_id = {
-                [this.db.Op.in]: params.ecompanyIds
+                [this.db.Op.in]: params.dkcompanyIds
            };
        }
-        if (params.ecompany_id) {
+        if (params.dktemplateIds) {
-            where.ecompany_id = params.ecompany_id;
+            where.dktemplate_id = {
+                [this.db.Op.in]: params.dktemplateIds
+            };
+        }
+        if (params.dkcompany_id) {
+            where.dkcompany_id = params.dkcompany_id;
        }
        if (params.eflowstatusList) {
            where.eflowstatus = {
                [this.db.Op.in]: params.eflowstatusList
            };
-            ;
        }
        if (params.accountName || params.accountMobile || params.accountIdno) {
@@ -115,11 +120,11 @@ class DKcontractService extends ServiceBase {
        }
        this.addWhereTime(where, 'completed_at', params.signBegin, params.signEnd, true);
-        var orderby = [
+        let orderby = [
            ["id", 'desc']
        ];
-        var attributes = [`id`, `fileurl`, `eflowstatus`, `eflowstatusname`, `completed_at`, `end_at`, `user_id`, `usereaccount_id`, `ecompany_id`];
+        var attributes = [`id`, `fileurl`, `eflowstatus`, `eflowstatusname`, `completed_at`, `end_at`, `user_id`, `usereaccount_id`, `dkcompany_id`, `dktemplate_id`];
        var page = await this.getPageList(currentPage, pageSize, where, orderby, attributes);
        if (page && page.rows) {
@@ -156,11 +161,11 @@ class DKcontractService extends ServiceBase {
        var companyIds = [];
        for (var item of list) {
-            companyIds.push(item.ecompany_id || 0);
+            companyIds.push(item.dkcompany_id || 0);
        }
-        var companyMap = await this.ecompanyDao.findMapByIds(companyIds, " id, name, contractMobile ");
+        var companyMap = await this.dkcompanyDao.findMapByIds(companyIds, " id, name ");
        for (var item of list) {
-            item.ecompany = companyMap["id_" + (item.ecompany_id || 0)];
+            item.dkcompany = companyMap["id_" + (item.dkcompany_id || 0)] || {};
        }
    }

--- a/bpo-web/app/base/service/impl/econtractSve.js
+++ b/bpo-web/app/base/service/impl/econtractSve.js
@@ -346,7 +346,6 @@ class EcontractService extends ServiceBase {
            where.eflowstatus = {
                [this.db.Op.in]: params.eflowstatusList
            };
-            ;
        }
        if (params.accountName || params.accountMobile || params.accountIdno) {

--- a/bpo-web/app/base/service/impl/etemplatebusiSve.js
+++ b/bpo-web/app/base/service/impl/etemplatebusiSve.js
@@ -37,6 +37,11 @@ class EtemplatebusiService extends ServiceBase {
        return ids;
    }
+    async byBusiId(busi_id) {
+        var sql = "SELECT template_type, template_id FROM c_etemplate_busi WHERE busi_id = :busi_id";
+        return await this.customQuery(sql, {busi_id: busi_id});
+    }
    async busiByTemplate(template_id) {
        var sql = "SELECT * FROM c_etemplate_busi WHERE template_type = 2 AND template_id = :template_id";
        return await this.customQuery(sql, {template_id: template_id});

--- a/bpo-web/app/front/entry/public/dvLuU2i3uC.txt
+++ b/bpo-web/app/front/entry/public/dvLuU2i3uC.txt
+fffe49f885f64544ef10bcd428953f02
\ No newline at end of file