From 23df781ef8c79800568b43d4255cf3b29087e33d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 18 Jun 2020 18:12:05 +0800
Subject: [PATCH] 1.修改pom文件，增加版本号可配置 2.整理所有的生成model，增加将long的序列化，日期格式统一格式化注解。 3.修改注册/添加账号接口（未调试） 4.对以前写的代码，事务的回滚做统一 5.增加数据需求的列表/添加数据的接口 6.将限制账户数量从医院表转移到科室表
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
index c3ade36..46ac6c3 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
@@ -2,6 +2,9 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -33,11 +36,13 @@
* 对应product_order表中的id
*/
@NotEmpty(message = "对应product_order表中的id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orderId;
/**
* 产品/明细ID
*/
@NotEmpty(message = "产品/明细ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long proId;
/**
* 产品/明细名称
@@ -63,20 +68,22 @@
/**
* 读片量
*/
- @NotEmpty(message = "读片量不能为空")
+ @NotNull(message = "读片量不能为空")
private Integer ailightCount;
/**
* 报告量
*/
- @NotEmpty(message = "报告量不能为空")
+ @NotNull(message = "报告量不能为空")
private Integer recordCount;
/**
* 有效的开始时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date proBegintime;
/**
* 有效的结束时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date proEndtime;
/**
* 状态，1启用，0停用
--
Gitblit v1.8.0