Merge branch 'xggsve-invoice-dev' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-invoice-dev

xggsve-invoice/app/base/db/impl/invoice/iinvoicedeliverDao.js

@@ -40,7 +40,7 @@ class IinvoicedeliverDao extends Dao {
   async pageByParams(params, startRow, pageSize) {
   async pageByParams(params, startRow, pageSize) {
     var sql = [];
     var sql = [];
     sql.push("SELECT");
     sql.push("SELECT");
-    sql.push("t1.`product_id`, ");
+    sql.push("t1.`product_id`, t1.`id`,");
     sql.push("t1.`apply_no`, t1.`invoice_type`, t1.`invoice_amount`, ");
     sql.push("t1.`apply_no`, t1.`invoice_type`, t1.`invoice_amount`, ");
     sql.push("t1.`apply_time`, t1.invoice_no, t1.invoice_time, t1.invoice_number, ");
     sql.push("t1.`apply_time`, t1.invoice_no, t1.invoice_time, t1.invoice_number, ");
     sql.push("t1.businessmen_name, t1.businessmen_credit_code, t1.businessmen_addr, ");
     sql.push("t1.businessmen_name, t1.businessmen_credit_code, t1.businessmen_addr, ");
@@ -105,6 +105,16 @@ class IinvoicedeliverDao extends Dao {
     }
     }
   }
   }
 
 
+  /**
+   * 根据invoice_id 获取 交付信息
+   * @param {*} invoice_id 
+   */
+  async findOne(invoice_id){
+    let sql =`SELECT * FROM I_INVOICE_DELIVER WHERE INVOICE_ID=:invoice_id`;
+    var _invoiceDeliver = await this.customQuery(sql, { invoice_id: invoice_id });
+    return _invoiceDeliver ||{};
+  }
+
   // //交付商业务概览
   // //交付商业务概览
   // async countStat(params) {
   // async countStat(params) {
   //   var sql = [];
   //   var sql = [];

xggsve-invoice/app/base/service/impl/invoice/iinvoiceSve.js

@@ -308,28 +308,24 @@ class IInvoiceService extends ServiceBase {
       return system.getResult(null,`参数错误 ID不能为空`)
       return system.getResult(null,`参数错误 ID不能为空`)
     }
     }
     try {
     try {
-      let _invoice = await this.dao.findById(this.trim(params.id));
+      let _invoice = await this.dao.getById(this.trim(params.id));
       if(!_invoice){
       if(!_invoice){
         return system.getResult(null,`发票不存在`);
         return system.getResult(null,`发票不存在`);
       }
       }
       this.handleDate(_invoice, ['invoice_time','apply_time','updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
       this.handleDate(_invoice, ['invoice_time','apply_time','updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
 
 
-      let _invoiceinforeg = await this.iinvoiceinforegDao.findById(this.trim(params.id)) || {};
+      let _invoiceinforeg = await this.iinvoiceinforegDao.getById(this.trim(params.id)) || {};
       this.handleDate(_invoiceinforeg, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
       this.handleDate(_invoiceinforeg, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
-      let _invoicedeliver =  await this.iinvoicedeliverDao.model.findOne({
-        where:{
-          invoice_id:_invoice.id
-        }
-      }) || {};
+      let _invoicedeliver =  await this.iinvoicedeliverDao.findOne(this.trim(params.id)) || {};
       this.handleDate(_invoicedeliver, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
       this.handleDate(_invoicedeliver, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
 
 
-      let _invoicesummaryinfo = await this.iinvoicesummaryinfoDao.findById(this.trim(params.id));
+      let _invoicesummaryinfo = await this.iinvoicesummaryinfoDao.getById(this.trim(params.id));
       _invoicesummaryinfo.summary = JSON.parse(_invoicesummaryinfo.summary);
       _invoicesummaryinfo.summary = JSON.parse(_invoicesummaryinfo.summary);
       this.handleDate(_invoicesummaryinfo, ['invoice_time','updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
       this.handleDate(_invoicesummaryinfo, ['invoice_time','updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
 
 
-      _invoice.dataValues.invoiceinforeg= _invoiceinforeg;
-      _invoice.dataValues.invoicedeliver= _invoicedeliver;
-      _invoice.dataValues.invoicesummaryinfo= _invoicesummaryinfo;
+      _invoice.invoiceinforeg= _invoiceinforeg;
+      _invoice.invoicedeliver= _invoicedeliver;
+      _invoice.invoicesummaryinfo= _invoicesummaryinfo;
       return system.getResult(_invoice);
       return system.getResult(_invoice);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);