update

center-order/app/base/service/impl/dbcorder/orderdeliverSve.js

@@ -340,7 +340,7 @@ class OrderInfoService extends ServiceBase {
         let pageIndex = Number(actionBody.pageIndex || 1);
         let pageIndex = Number(actionBody.pageIndex || 1);
         let from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
         let from = pageIndex == 1 ? 0 : Number((pageIndex - 1) * pageSize);
 
 
-        let sql = `select o.serviceNo,json_extract(officialInfo,'$.applyUser') applyUser,json_extract(officialInfo,'$.askforId') askforId,json_extract(officialInfo,'$.tmType') tmType,json_extract(officialInfo,'$.tmPicUrl') tmPicUrl,json_extract(officialInfo,'$.applicantName') applicantName,json_extract(officialInfo,'$.fileType') fileType,json_extract(officialInfo,'$.received_at') received_at from c_order_info i left join c_delivery_official o on i.orderNo = o.serviceNo  where i.uapp_id = ${pobj.appInfo.uapp_id}`;
+        let sql = `select o.serviceNo,json_extract(officialInfo,'$.dir') dir,json_extract(officialInfo,'$.askforId') askforId,json_extract(officialInfo,'$.tradeType') tmType,json_extract(officialInfo,'$.tradeImg') tmPicUrl,json_extract(officialInfo,'$.applicantName') applicantName,json_extract(officialInfo,'$.fileType') fileType,json_extract(officialInfo,'$.received_at') received_at from c_order_info i left join c_delivery_official o on i.orderNo = o.serviceNo  where i.uapp_id = ${pobj.appInfo.uapp_id}`;
         let sqlCount = `select count(1) as dataCount from c_order_info i left join c_delivery_official o on i.orderNo = o.serviceNo  where i.uapp_id = ${pobj.appInfo.uapp_id}`
         let sqlCount = `select count(1) as dataCount from c_order_info i left join c_delivery_official o on i.orderNo = o.serviceNo  where i.uapp_id = ${pobj.appInfo.uapp_id}`
 
 
         if (pobj.userInfo.channel_userid) {
         if (pobj.userInfo.channel_userid) {
@@ -365,8 +365,8 @@ class OrderInfoService extends ServiceBase {
         }
         }
 
 
         if (actionBody.startTime && actionBody.entTime) {
         if (actionBody.startTime && actionBody.entTime) {
-            var startTime = actionBody.startTime.trim() + " 00:00:00";
-            var endTime = actionBody.entTime + " 23:59:59";
+            var startTime = actionBody.startTime.trim();
+            var endTime = actionBody.entTime;
             sql += ` and json_extract(officialInfo,'$.received_at') >='${startTime}' and  json_extract(officialInfo,'$.received_at')<='${endTime}'`;
             sql += ` and json_extract(officialInfo,'$.received_at') >='${startTime}' and  json_extract(officialInfo,'$.received_at')<='${endTime}'`;
             sqlCount += ` and json_extract(officialInfo,'$.received_at') >='${startTime}' and  json_extract(officialInfo,'$.received_at')<='${endTime}'`;
             sqlCount += ` and json_extract(officialInfo,'$.received_at') >='${startTime}' and  json_extract(officialInfo,'$.received_at')<='${endTime}'`;
         }
         }