From 705885f97b5a31916e6350341bd679a3f1fb2d78 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 24 Dec 2020 17:42:37 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 15 +++++++++++++++
zq-erp/src/main/java/com/matrix/system/app/dto/OrderListDto.java | 26 +++++++++++++++++++++++++-
2 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
new file mode 100644
index 0000000..84cb5ca
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java
@@ -0,0 +1,15 @@
+package com.matrix.system.app.action;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wzy
+ * @date 2020-12-24
+ **/
+@Api(value = "ApiServiceOrderAction", tags = "服务单接口类")
+@RestController
+@RequestMapping(value = "/api/serviceOrder")
+public class ApiServiceOrderAction {
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/OrderListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/OrderListDto.java
index ede78d4..d1e10e3 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/OrderListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/OrderListDto.java
@@ -10,7 +10,10 @@
@ApiModel(value = "OrderListDto", description = "订单列表接收参数类")
public class OrderListDto extends BasePageDto {
- @ApiModelProperty(value = "订单状态", example = "已付款 全部默认传空字符串")
+ @ApiModelProperty(value = "订单状态 0-全部 1-待付款 2-已付款 3-欠款 全部默认传空字符串", example = "1")
+ private Integer orderStatus;
+
+ @ApiModelProperty(hidden = true)
private String status;
@ApiModelProperty(value = "查询字段")
@@ -43,4 +46,25 @@
this.queryKey = queryKey;
}
+ public Integer getOrderStatus() {
+ return orderStatus;
+ }
+
+ public void setOrderStatus(Integer orderStatus) {
+ this.orderStatus = orderStatus;
+ switch (orderStatus) {
+ case 0 :
+ this.status = "";
+ break;
+ case 1:
+ this.status = "待付款";
+ case 2:
+ this.status = "已付款";
+ case 3:
+ this.status = "欠款";
+ default:
+ this.status = "";
+ break
+ }
+ }
}
--
Gitblit v1.9.1