clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

确认中订单查询及订单数量统计排除workFinishTime为空的数据

This commit is contained in:
donqi 2023-03-27 22:20:26 +08:00
parent ab0183910a
commit 6172a682ab
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -662,7 +662,9 @@ public class OrderController extends BaseController {
response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail)); response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail));
// 统计待确认单量 // 统计待确认单量
orderDetail.setOrderStatus(OrderStatus.FINISH_CHECK.code()); orderDetail.setOrderStatus(OrderStatus.FINISH_CHECK.code());
orderDetail.setWorkFinishTimeExisted(true);
response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail)); response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail));
orderDetail.setWorkFinishTimeExisted(false);
// 统计已完成子单量 // 统计已完成子单量
orderDetail.setOrderStatus(OrderStatus.FINISH.code()); orderDetail.setOrderStatus(OrderStatus.FINISH.code());
response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail)); response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail));

2
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
View File

@ -128,4 +128,6 @@ public class OrderDetail extends BaseEntity {
private BigDecimal financialMasterMoney; private BigDecimal financialMasterMoney;
private BigDecimal financialDetailMoney; private BigDecimal financialDetailMoney;
private BigDecimal changeMoney; private BigDecimal changeMoney;
private boolean workFinishTimeExisted;
} }

6
ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
View File

@ -140,6 +140,9 @@
<if test="drawCashStatus != null"> <if test="drawCashStatus != null">
AND od.draw_cash_status = ${drawCashStatus} AND od.draw_cash_status = ${drawCashStatus}
</if> </if>
<if test="workFinishTimeExisted">
AND od.work_finish_time is not null
</if>
</where> </where>
order by od.create_time order by od.create_time
<trim suffixOverrides=","> <trim suffixOverrides=",">
@ -193,6 +196,9 @@
<if test="shelveStatus != null"> <if test="shelveStatus != null">
AND od.shelve_status = ${shelveStatus} AND od.shelve_status = ${shelveStatus}
</if> </if>
<if test="workFinishTimeExisted">
AND od.work_finish_time is not null
</if>
</where> </where>
order by od.create_time order by od.create_time
<trim suffixOverrides=","> <trim suffixOverrides=",">