gsb

laowubao/app/base/db/impl/operator/taxinfoDao.js

@@ -111,6 +111,15 @@ class TaxinfoDao extends Dao {
     return await this.customQuery(sql.join(" "), params);
     return await this.customQuery(sql.join(" "), params);
   }
   }
 
 
+  async byIdNo(idNo) {
+    var sql = [];
+    sql.push("SELECT");
+    sql.push("*");
+    sql.push("FROM `tax_info`");
+    sql.push("WHERE id_no = :idNo");
+    return await this.customQuery(sql.join(" "), {idNo: idNo});
+  }
+
   setCondition(sql, params) {
   setCondition(sql, params) {
     if (params.user_id) {
     if (params.user_id) {
       sql.push("AND user_id = :user_id");
       sql.push("AND user_id = :user_id");

laowubao/app/base/service/impl/operator/taxinfoSve.js

@@ -2,6 +2,7 @@ const system = require("../../../system");
 const ServiceBase = require("../../sve.base");
 const ServiceBase = require("../../sve.base");
 const settings = require("../../../../config/settings");
 const settings = require("../../../../config/settings");
 var moment = require('moment');
 var moment = require('moment');
+
 class TaxinfoService extends ServiceBase {
 class TaxinfoService extends ServiceBase {
   constructor() {
   constructor() {
     super("operator", ServiceBase.getDaoName(TaxinfoService));
     super("operator", ServiceBase.getDaoName(TaxinfoService));
@@ -15,38 +16,38 @@ class TaxinfoService extends ServiceBase {
     try {
     try {
       var currentPage = Number(params.currentPage || 1);
       var currentPage = Number(params.currentPage || 1);
       var pageSize = Number(params.pageSize || 10);
       var pageSize = Number(params.pageSize || 10);
-            if(!params.userId){
-                return system.getResult(null,`参数错误 userId不能为空`);
-            }else{
+      if (!params.userId) {
+        return system.getResult(null, `参数错误 userId不能为空`);
+      } else {
         params.user_id = this.trim(params.userId);
         params.user_id = this.trim(params.userId);
       }
       }
       var where = {};
       var where = {};
 
 
-            if(params.curDate){
+      if (params.curDate) {
         let curDate = this.trim(params.curDate);
         let curDate = this.trim(params.curDate);
         let maxDate = moment(curDate, "YYYY-MM").daysInMonth() // 29
         let maxDate = moment(curDate, "YYYY-MM").daysInMonth() // 29
 
 
         let beginTime = `${curDate}-01 00:00:00`;
         let beginTime = `${curDate}-01 00:00:00`;
-                let endTime =`${curDate}-${maxDate} 23:59:59`;
+        let endTime = `${curDate}-${maxDate} 23:59:59`;
 
 
         where.tax_time = {
         where.tax_time = {
-                    [this.db.Op.between]:[beginTime, endTime]
+          [this.db.Op.between]: [beginTime, endTime]
         };
         };
       }
       }
-            where.user_id=params.user_id;
+      where.user_id = params.user_id;
       var orderby = [
       var orderby = [
         ["id", 'desc']
         ["id", 'desc']
       ];
       ];
       var page = await this.getPageList(currentPage, pageSize, where, orderby);
       var page = await this.getPageList(currentPage, pageSize, where, orderby);
       if (page && page.rows) {
       if (page && page.rows) {
         for (var row of page.rows) {
         for (var row of page.rows) {
-                    this.handleDate(row, ["tax_time"],null,-8);
+          this.handleDate(row, ["tax_time"], null, -8);
         }
         }
       }
       }
       return system.getResult(page);
       return system.getResult(page);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
-            return system.getResult(-1,`系统错误 错误信息 ${error}`);
+      return system.getResult(-1, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }
 
 
@@ -67,14 +68,14 @@ class TaxinfoService extends ServiceBase {
       let list = await this.dao.pageByUser(params);
       let list = await this.dao.pageByUser(params);
       if (list) {
       if (list) {
         for (var item of list) {
         for (var item of list) {
-                    this.handleDate(row, ["tax_time"],null,-8);
+          this.handleDate(row, ["tax_time"], null, -8);
         }
         }
       }
       }
       return {count: total, rows: list};
       return {count: total, rows: list};
       return system.getResult(page);
       return system.getResult(page);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
-            return system.getResult(-1,`系统错误 错误信息 ${error}`);
+      return system.getResult(-1, `系统错误 错误信息 ${error}`);
     }
     }
   }
   }
 
 
@@ -82,16 +83,25 @@ class TaxinfoService extends ServiceBase {
    * 查询明细
    * 查询明细
    * @param {}} params
    * @param {}} params
    */
    */
-    async taxinfoById(params){
+  async taxinfoById(params) {
     try {
     try {
-            if(!params.id){
-                return system.getResult(-1,`参数错误 ID不能为空`);
+      if (!params.id) {
+        return system.getResult(-1, `参数错误 ID不能为空`);
       }
       }
       let info = await this.findById(this.trim(params.id));
       let info = await this.findById(this.trim(params.id));
-            return system.getResult(info);
+
+      if (!info) {
+        return system.getResultSuccess([]);
+      }
+
+      let list = await this.dao.byIdNo(info.id_no) || [];
+      for (var row of list) {
+        this.handleDate(row, ["tax_time"], null, -8);
+      }
+      return system.getResultSuccess(list);
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
-            return system.getResult(null,`系统错误 错误信息${error}`);
+      return system.getResult(null, `系统错误 错误信息${error}`);
     }
     }
   }
   }
 }
 }