From 9baa9caf5913861e5a81da7c262d9eb87e42db57 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Dec 2020 16:59:08 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java | 2 +-
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 2 +-
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java | 2 +-
zq-erp/src/main/java/com/matrix/system/app/dto/BeauticianDto.java | 4 ++++
zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java | 2 +-
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 2 +-
zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java | 3 +++
7 files changed, 12 insertions(+), 5 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
index 5673459..4d11ac1 100644
--- 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
@@ -103,7 +103,7 @@
@ApiOperation(value = "提交服务单", notes = "提交服务单")
@PostMapping(value = "/createServiceOrder")
public AjaxResult createServiceOrder(@RequestBody @Validated CreateServiceOrderDto serviceOrderDto) {
- if (CollectionUtils.isNotEmpty(serviceOrderDto.getProjItems())) {
+ if (CollectionUtils.isEmpty(serviceOrderDto.getProjItems())) {
throw new GlobleException("请选择服务");
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/BeauticianDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/BeauticianDto.java
index 1090401..362d34f 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/BeauticianDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/BeauticianDto.java
@@ -1,5 +1,7 @@
package com.matrix.system.app.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,10 +15,12 @@
@ApiModel(value = "BeauticianDto", description = "获取美疗师列表接收参数类")
public class BeauticianDto {
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@NotNull(message = "开始时间不能为空")
@ApiModelProperty(value = "开始时间")
private Date startTime;
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@NotNull(message = "结束时间不能为空")
@ApiModelProperty(value = "结束时间")
private Date endTime;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
index b8431ac..dadc947 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/CreateServiceOrderDto.java
@@ -1,5 +1,7 @@
package com.matrix.system.app.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +25,7 @@
private Long beautyId;
@NotNull(message = "请选择预约时间")
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@ApiModelProperty(value = "预约时间")
private Date yyTime;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
index 172951c..dcc8ff6 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
@@ -55,7 +55,7 @@
@ApiModelProperty(value = "欠款")
private BigDecimal arrears;
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS, timezone = "GMT+8")
@ApiModelProperty(value = "下单时间")
private Date orderTime;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
index 292ba6c..c55642e 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
@@ -21,7 +21,7 @@
@ApiModelProperty(value = "服务单编号")
private String serviceNo;
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@ApiModelProperty(value = "预约时间")
private Date time;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
index 89504e2..a6ae967 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "时长")
private Integer timeLength;
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
@ApiModelProperty(value = "有效期")
private Date invalidTime;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
index dbcd082..0d8ab6a 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
@@ -23,7 +23,7 @@
@ApiModelProperty(value = "套餐名称")
private String name;
- @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
@ApiModelProperty(value = "有效期")
private Date invalidTime;
--
Gitblit v1.9.1