qin 1 rok temu
rodzic
commit
bbf05499bf

+ 1 - 1
src/main/java/com/poteviohealth/cgp/statistics/service/impl/OrderServiceImpl.java

@@ -284,7 +284,7 @@ public class OrderServiceImpl extends BaseServiceImpl<OrderMapper, Order> implem
         }
 
         if(StringUtils.isNotBlank(orderWebInDTO.getCode())){
-            orderQueryWrapper.eq( "so.n", orderWebInDTO.getCode());
+            orderQueryWrapper.eq( "o.sn", orderWebInDTO.getCode());
         }
         orderQueryWrapper.eq( "o.status", 1);
         if(orderWebInDTO.getRevenueStatus() != null){

+ 1 - 1
src/main/resources/mapper/statistics/OrderMapper.xml

@@ -327,7 +327,7 @@
             o.employee_name,
             o.service_name,
             DATE_FORMAT(o.order_time,'%Y-%m-%d %H:%i') AS orderTime,
-            DATE_FORMAT(o.end_time,'%Y-%m-%d %H:%i') AS end_time,
+            DATE_FORMAT(o.end_time,'%Y-%m-%d %H:%i') AS endTime,
             case when o.revenue_status = 1 then '未核算' else '已核算' end  as revenueStatusStr,
             TRUNCATE (o.sign_price/ 100.0, 2 ) AS signPrice,
             o.man_hour,