需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -2,6 +2,7 @@ package com.gree.mall.miniapp.logic.workorder;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.db.sql.Order;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -59,7 +60,8 @@ public class OrderBaseLogic {
      */
     public CountOrderStatusBean countOrderStatus(String pgIncreOrderId, Boolean isYb, Boolean isWb) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        CountOrderStatusBean countOrderStatusBean = orderBaseCMapper.countOrderStatus(currentCompanyWechat.getUserId(), currentCompanyWechat.getUser().getWorkerNumber(), pgIncreOrderId, isYb, isWb, currentCompanyWechat.getCompanyWechatId());
+        CountOrderStatusBean countOrderStatusBean = orderBaseCMapper.countOrderStatus(currentCompanyWechat.getUserId(),
+                currentCompanyWechat.getUser().getWorkerNumber(), pgIncreOrderId, isYb, isWb, currentCompanyWechat.getCompanyWechatId());
         CountOrderStatusBean countOrderStatusBean2 = orderBaseCMapper.countPartsApply(currentCompanyWechat.getUserId());
         if (countOrderStatusBean2 != null) {
             countOrderStatusBean.setPing(countOrderStatusBean2.getPing());

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -9,8 +9,8 @@
             count(DISTINCT if(a.is_exception=1,a.id,null)) 'ycd',
             count(DISTINCT if(a.order_status='DQD',a.id,null)) 'dqd',
             count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG') and a.is_meet = true,a.id,null)) 'ywg',
-            count(DISTINCT if(a.over_time between date(now()) and now(),a.id,null)) 'jrwg',
-            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG'),a.id,null)) 'jbnwg',
+            count(DISTINCT if(a.over_time between CONCAT(CURDATE(), ' 00:00:00') and CONCAT(CURDATE(), ' 23:59:59') and a.is_meet = true,a.id,null)) 'jrwg',
+            count(DISTINCT if(a.order_status in ('YWG','YJS','GCSZX','YWGO','WDWG') and a.over_time > CONCAT(DATE_SUB(CURDATE(), INTERVAL 6 MONTH) , ' 00:00:00') and a.is_meet = true,a.id,null)) 'jbnwg',
             count(DISTINCT if((a.order_status not in ('YWG','YJS','GCSZX','YWGO','WDWG','DQD') AND a.is_meet = true ) or
             ( a.is_meet = false )
             ,a.id,null)) 'WWG',
@@ -28,7 +28,7 @@
         and a.pg_incre_order_id = #{pgIncreOrderId}
     </if>
     and a.company_wechat_id = #{companyWechatId}
-    and a.create_time > date_sub(now(),INTERVAL 180 day)
+
     </select>
 
     <select id="countPartsApply" resultType="com.gree.mall.miniapp.bean.workorder.CountOrderStatusBean">