tj

igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js

@@ -552,53 +552,67 @@ class OrderTmProductService extends ServiceBase {
       " c.`customerType`,c.`businessLicensePic`,c.`identityCardPic`,tm.`gzwtsUrl`,tm.`smwjUrl`" +
       " c.`customerType`,c.`businessLicensePic`,c.`identityCardPic`,tm.`gzwtsUrl`,tm.`smwjUrl`" +
       " FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +
       " FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +
       " `b_customerinfo` AS c ON tm.`deliveryOrderNo`=c.`deliveryOrderNo` where tm.deleted_at is null ";
       " `b_customerinfo` AS c ON tm.`deliveryOrderNo`=c.`deliveryOrderNo` where tm.deleted_at is null ";
+    var sqlCount = "SELECT count(1) FROM `b_order_tm_product` AS tm LEFT JOIN `b_order` AS o ON tm.`sourceOrderNo`=o.`orderNo` LEFT JOIN" +
+      " `b_customerinfo` AS c ON tm.`deliveryOrderNo`=c.`deliveryOrderNo` where tm.deleted_at is null ";
     var paramWhere = {};
     var paramWhere = {};
     if (req.user) {
     if (req.user) {
       sql += " and tm.createuser_id=:createuser_id";
       sql += " and tm.createuser_id=:createuser_id";
+      sqlCount += " and tm.createuser_id=:createuser_id";
       paramWhere.createuser_id = req.user.id;
       paramWhere.createuser_id = req.user.id;
     }
     }
     if (params.channelServiceNo) {
     if (params.channelServiceNo) {
       sql += " and tm.channelServiceNo like :channelServiceNo";
       sql += " and tm.channelServiceNo like :channelServiceNo";
+      sqlCount += " and tm.channelServiceNo like :channelServiceNo";
       paramWhere.channelServiceNo = "%" + params.channelServiceNo.trim() + "%";
       paramWhere.channelServiceNo = "%" + params.channelServiceNo.trim() + "%";
     }
     }
     if (params.deliveryOrderNo) {
     if (params.deliveryOrderNo) {
       sql += " and tm.deliveryOrderNo like :deliveryOrderNo";
       sql += " and tm.deliveryOrderNo like :deliveryOrderNo";
+      sqlCount += " and tm.deliveryOrderNo like :deliveryOrderNo";
       paramWhere.deliveryOrderNo = "%" + params.deliveryOrderNo.trim() + "%";
       paramWhere.deliveryOrderNo = "%" + params.deliveryOrderNo.trim() + "%";
     }
     }
     if (params.itemCode) {
     if (params.itemCode) {
       sql += " and tm.itemCode=:itemCode";
       sql += " and tm.itemCode=:itemCode";
+      sqlCount += " and tm.itemCode=:itemCode";
       paramWhere.itemCode = params.itemCode;
       paramWhere.itemCode = params.itemCode;
     }
     }
     if (params.deliveryStatus) {
     if (params.deliveryStatus) {
       sql += " and tm.deliveryStatus=:deliveryStatus";
       sql += " and tm.deliveryStatus=:deliveryStatus";
+      sqlCount += " and tm.deliveryStatus=:deliveryStatus";
       paramWhere.deliveryStatus = params.deliveryStatus;
       paramWhere.deliveryStatus = params.deliveryStatus;
     }
     }
     if (params.payStatus) {
     if (params.payStatus) {
       sql += " and tm.payStatus=:payStatus";
       sql += " and tm.payStatus=:payStatus";
+      sqlCount += " and tm.payStatus=:payStatus";
       paramWhere.payStatus = params.payStatus;
       paramWhere.payStatus = params.payStatus;
     }
     }
     if (params.tmName) {
     if (params.tmName) {
       sql += " and tm.tmName like :tmName";
       sql += " and tm.tmName like :tmName";
+      sqlCount += " and tm.tmName like :tmName";
       paramWhere.tmName = +"%" + params.tmName.trim() + "%";
       paramWhere.tmName = +"%" + params.tmName.trim() + "%";
     }
     }
     if (params.name) {
     if (params.name) {
       sql += " and c.name like :name";
       sql += " and c.name like :name";
+      sqlCount += " and c.name like :name";
       paramWhere.name = "%" + params.name.trim() + "%";
       paramWhere.name = "%" + params.name.trim() + "%";
     }
     }
     if (params.startTime && params.entTime) {
     if (params.startTime && params.entTime) {
       var startTime = params.startTime.trim() + " 00:00:00";
       var startTime = params.startTime.trim() + " 00:00:00";
       var entTime = params.entTime + " 23:59:59";
       var entTime = params.entTime + " 23:59:59";
       sql += " and o.created_at >=:startTime and  o.created_at<=:entTime";
       sql += " and o.created_at >=:startTime and  o.created_at<=:entTime";
+      sqlCount += " and o.created_at >=:startTime and  o.created_at<=:entTime";
       paramWhere.startTime = startTime;
       paramWhere.startTime = startTime;
       paramWhere.entTime = entTime;
       paramWhere.entTime = entTime;
     }
     }
     sql += " order by tm.id desc LIMIT " + pageSize + " OFFSET " + from + "";
     sql += " order by tm.id desc LIMIT " + pageSize + " OFFSET " + from + "";
 
 
     var tmpResult = await this.customQuery(sql, paramWhere);
     var tmpResult = await this.customQuery(sql, paramWhere);
+    var tmpResultCount = await this.customQuery(sqlCount, paramWhere);
     if (!tmpResult || tmpResult.length == 0) {
     if (!tmpResult || tmpResult.length == 0) {
       return system.getResultSuccess(null, "暂无数据");
       return system.getResultSuccess(null, "暂无数据");
     }
     }
-    return system.getResultSuccess(tmpResult);
+    var result = system.getResultSuccess(tmpResult);
+    result.dataCount = tmpResultCount || 0;
+    return result;
   }
   }
   /**
   /**
    * 商标交付信息
    * 商标交付信息

igirl-channel/表的更新

+示例：----------------------------------开始--------------------------------------------------------------------
+示例：----------------------------------开始--------------------------------------------------------------------
+ALTER TABLE p_channel ADD COLUMN totalChannelProfit  DECIMAL(12,2) DEFAULT 0 COMMENT '渠道总利润';
+ALTER TABLE h_page_statistics ADD COLUMN isRead int default 0 COMMENT '是否阅读,0未，1是'; 
+ALTER TABLE b_customer_roll_pic ADD COLUMN picCategory ENUM('ip','ic','pa','icbc','common') DEFAULT 'ip';
+ALTER TABLE p_customer_info DROP  COLUMN customerContact;
+ALTER TABLE biz_receiptvoucher modify COLUMN receiptType ENUM('sk','tk','zz','csrz','ptdsk','ptzz') DEFAULT 'sk';
+示例：----------------------------------结束--------------------------------------------------------------------
+
+ALTER TABLE c_app_product ADD COLUMN pushServiceItemCode VARCHAR(100) DEFAULT NULL COMMENT '推送到服务商的产品编码'; 
+ALTER TABLE b_order ADD COLUMN needNoOrderNo VARCHAR(64) DEFAULT NULL COMMENT '需求订单号'; 
+ALTER TABLE b_order_tm_product ADD COLUMN needNoOrderNo VARCHAR(64) DEFAULT NULL COMMENT '需求订单号'; 
\ No newline at end of file