Merge branch 'center-tmtransaction' of gitlab.gongsibao.com:jiangyong/zhichan…

Merge branch 'center-tmtransaction' of gitlab.gongsibao.com:jiangyong/zhichan into center-tmtransaction

center-tmtransaction/app/base/service/impl/tm/trademarktransactionSve.js

@@ -294,8 +294,8 @@ class TrademarktransactionService extends ServiceBase {
     if (!ab.channel_code) {
     if (!ab.channel_code) {
       return system.getResultFail(-104, "渠道码不能为空");
       return system.getResultFail(-104, "渠道码不能为空");
     }
     }
-    var limit = ab.PageSize ? Number(ab.PageSize) : 10;
-    var offset = ab.PageNumber ? (Number(ab.PageNumber) - 1) * limit : 0
+    var limit = ab.pageSize ? Number(ab.pageSize) : 10;
+    var offset = ab.pageNumber ? (Number(ab.pageNumber) - 1) * limit : 0
     var countObj = { channel_code: ab.channel_code };
     var countObj = { channel_code: ab.channel_code };
     var whereObj = { channel_code: ab.channel_code };
     var whereObj = { channel_code: ab.channel_code };
     if (ab.excelName) {// 商标名称
     if (ab.excelName) {// 商标名称
@@ -310,13 +310,13 @@ class TrademarktransactionService extends ServiceBase {
       whereObj["channel_name"] = { [this.db.Op.like]: "%" + ab.channel_name + "%" };
       whereObj["channel_name"] = { [this.db.Op.like]: "%" + ab.channel_name + "%" };
       countObj["channel_name"] = { [this.db.Op.like]: "%" + ab.channel_name + "%" };
       countObj["channel_name"] = { [this.db.Op.like]: "%" + ab.channel_name + "%" };
     }
     }
-    if (ab.stdate && ab.endate) {// 专用期限
+    if (ab.tm_start_day && ab.tm_end_day) {// 专用期限
       // whereObj["created_at"] = { [this.db.Op.between]: [ab.stdate, ab.endate] };
       // whereObj["created_at"] = { [this.db.Op.between]: [ab.stdate, ab.endate] };
       // countObj["created_at"] = { [this.db.Op.between]: [ab.stdate, ab.endate] };
       // countObj["created_at"] = { [this.db.Op.between]: [ab.stdate, ab.endate] };
-      whereObj["tm_start_day"] = { [this.db.Op.gte]: ab.stdate };
-      whereObj["tm_end_day"] = { [this.db.Op.lte]: ab.endate };
-      countObj["tm_start_day"] = { [this.db.Op.gte]: ab.stdate };
-      countObj["tm_end_day"] = { [this.db.Op.lte]: ab.endate };
+      whereObj["tm_start_day"] = { [this.db.Op.gte]: ab.tm_start_day };
+      whereObj["tm_end_day"] = { [this.db.Op.lte]: ab.tm_end_day };
+      countObj["tm_start_day"] = { [this.db.Op.gte]: ab.tm_start_day };
+      countObj["tm_end_day"] = { [this.db.Op.lte]: ab.tm_end_day };
     }
     }
     var count = await this.dao.findCount({ where: countObj });
     var count = await this.dao.findCount({ where: countObj });
     var list = await this.dao.model.findAll({
     var list = await this.dao.model.findAll({