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

主单列表页面查询修改

This commit is contained in:
donqi 2023-06-26 00:31:20 +08:00
parent d6bd909075
commit bb5f136025
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ghy-admin/src/main/resources/templates/order/orderManager.html
View File

@ -80,16 +80,18 @@
已发布 已发布
(<span id="publishedOrderNum">0</span>) (<span id="publishedOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1})"> <!-- <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1})">-->
已接单 <!-- 已接单-->
(<span id="acceptedOrderNum">0</span>) <!-- (<span id="acceptedOrderNum">0</span>)-->
<!-- </a>-->
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '01'})">
未约时
(<span id="notAppointedOrderNum">0</span>)
</a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">
未排班
(<span id="notArrangedOrderNum">0</span>)
</a> </a>
<!-- <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '01'})">-->
<!-- 未约时-->
<!-- </a>-->
<!-- <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 1, isCall: '02'})">-->
<!-- 未排班-->
<!-- </a>-->
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 2})">
待上门 待上门
(<span id="waitForDoorOrderNum">0</span>) (<span id="waitForDoorOrderNum">0</span>)
@ -265,13 +267,13 @@
接单超时 接单超时
(<span id="newTimeoutOrderNum">0</span>) (<span id="newTimeoutOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1, isCall: '01'})">
约单超时 约单超时
(<span class="acceptedTimeoutOrderNum">0</span>) (<span id="notAppointedTimeoutOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {timeout: 1, orderStatus: 1, isCall: '02'})">
排单超时 排单超时
(<span class="acceptedTimeoutOrderNum">0</span>) (<span id="notArrangedTimeoutOrderNum">0</span>)
</a> </a>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})"> <a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: -1})">
无法排单 无法排单
@ -411,7 +413,8 @@
success: function (result) { success: function (result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
$('#newOrderNum').text(result.data.newOrderNum); $('#newOrderNum').text(result.data.newOrderNum);
$('#acceptedOrderNum').text(result.data.acceptedOrderNum); $('#notAppointedOrderNum').text(result.data.notAppointedOrderNum);
$('#notArrangedOrderNum').text(result.data.notArrangedOrderNum);
$('#canceledOrderNum').text(result.data.canceledOrderNum); $('#canceledOrderNum').text(result.data.canceledOrderNum);
$('.confirmingOrderNum').text(result.data.confirmingOrderNum); $('.confirmingOrderNum').text(result.data.confirmingOrderNum);
$('#finishedOrderNum').text(result.data.finishedOrderNum); $('#finishedOrderNum').text(result.data.finishedOrderNum);
@ -432,7 +435,8 @@
success: function (result) { success: function (result) {
if (result.code == web_status.SUCCESS) { if (result.code == web_status.SUCCESS) {
$('#newTimeoutOrderNum').text(result.data.newOrderNum); $('#newTimeoutOrderNum').text(result.data.newOrderNum);
$('.acceptedTimeoutOrderNum').text(result.data.acceptedOrderNum); $('#notAppointedTimeoutOrderNum').text(result.data.notAppointedOrderNum);
$('#notArrangedTimeoutOrderNum').text(result.data.notArrangedOrderNum);
$('#servingTimeoutOrderNum').text(result.data.servingOrderNum); $('#servingTimeoutOrderNum').text(result.data.servingOrderNum);
$('#waitForDoorTimeoutOrderNum').text(result.data.waitForDoorOrderNum); $('#waitForDoorTimeoutOrderNum').text(result.data.waitForDoorOrderNum);
} else { } else {

3
ghy-order/src/main/java/com/ghy/order/domain/OrderMasterCount.java
View File

@ -9,4 +9,7 @@ import lombok.Data;
*/ */
@Data @Data
public class OrderMasterCount extends OrderCount { public class OrderMasterCount extends OrderCount {
private Integer notAppointedOrderNum;
private Integer notArrangedOrderNum;
} }

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

@ -427,6 +427,8 @@
select select
count(case when om.order_status = 0 then 1 else null end) as newOrderNum, count(case when om.order_status = 0 then 1 else null end) as newOrderNum,
count(case when om.order_status = 1 then 1 else null end) as acceptedOrderNum, count(case when om.order_status = 1 then 1 else null end) as acceptedOrderNum,
count(case when om.order_status = 1 and om.is_call = '01' then 1 else null end) as notAppointedOrderNum,
count(case when om.order_status = 1 and om.is_call = '02' then 1 else null end) as notArrangedOrderNum,
count(case when om.order_status = 2 then 1 else null end) as waitForDoorOrderNum, count(case when om.order_status = 2 then 1 else null end) as waitForDoorOrderNum,
count(case when om.order_status = 3 then 1 else null end) as servingOrderNum, count(case when om.order_status = 3 then 1 else null end) as servingOrderNum,
count(case when om.order_status = 4 then 1 else null end) as confirmingOrderNum, count(case when om.order_status = 4 then 1 else null end) as confirmingOrderNum,
@ -437,6 +439,9 @@
<if test="timeout != null"> <if test="timeout != null">
AND om.timeout_ = #{timeout} AND om.timeout_ = #{timeout}
</if> </if>
<if test="isCall != null">
AND om.is_call = #{isCall}
</if>
</select> </select>
</mapper> </mapper>