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

问题修复

This commit is contained in:
donqi 2022-11-07 22:16:54 +08:00
parent 7ff90bb113
commit a478faa6bb
2 changed files with 3 additions and 3 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

@ -212,8 +212,8 @@ public class OrderController extends BaseController {
// 判断是否全部派完 // 判断是否全部派完
if(request.getIsAll() == 1){ if(request.getIsAll() == 1){
om.setOrderStatus(OrderStatus.GOING.code()); om.setOrderStatus(OrderStatus.GOING.code());
orderMasterService.updateOrderMaster(om);
} }
orderMasterService.updateOrderMaster(om);
// 创建子订单 // 创建子订单
OrderDetail od = new OrderDetail(); OrderDetail od = new OrderDetail();

4
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -78,7 +78,7 @@
<include refid="selectOrderMasterMoreInfo"></include> <include refid="selectOrderMasterMoreInfo"></include>
<where> <where>
<if test="isMonitoredOrder"> <if test="isMonitoredOrder">
AND all_self_assigned = 0 AND om.order_status in (2,3,4,5) AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5)
</if> </if>
<if test="deptId != null and deptId != 0"> <if test="deptId != null and deptId != 0">
AND om.dept_id = #{deptId} AND om.dept_id = #{deptId}
@ -152,7 +152,7 @@
SELECT COUNT(*) FROM order_master om SELECT COUNT(*) FROM order_master om
<where> <where>
<if test="isMonitoredOrder"> <if test="isMonitoredOrder">
AND all_self_assigned = 0 AND om.order_status in (2,3,4,5) AND all_self_assigned = 0 AND om.order_status in (1,2,3,4,5)
</if> </if>
<if test="deptId != null and deptId != 0"> <if test="deptId != null and deptId != 0">
AND om.dept_id = #{deptId} AND om.dept_id = #{deptId}