From 98144e3d0e3143f911ba796e24f9ed3c933fe46f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Aug 2022 17:21:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=AC=AC=E4=BA=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/AddSocietyOrgFormDTO.java | 8 +++++--- .../java/com/epmet/dto/form/EditSocietyOrgFormDTO.java | 6 ++++++ .../com/epmet/dto/result/GetListSocietyOrgResultDTO.java | 4 ++++ .../com/epmet/dto/result/SocietyOrgListResultDTO.java | 4 ++++ .../main/java/com/epmet/entity/IcSocietyOrgEntity.java | 5 +++++ .../com/epmet/service/impl/IcSocietyOrgServiceImpl.java | 4 +++- .../src/main/resources/mapper/IcSocietyOrgDao.xml | 1 + 7 files changed, 28 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java index 3473fde8c0..391652762d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddSocietyOrgFormDTO.java @@ -24,7 +24,6 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; @@ -78,16 +77,19 @@ public class AddSocietyOrgFormDTO implements Serializable { @NotBlank(message = "负责人电话不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Add.class}) private String mobile; + /** + * 服务时间 + */ + @NotBlank(message = "服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) + private String serviceTimeStr; /** * 起始服务时间 */ - @NotNull(message = "起始服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date serviceStartTime; /** * 终止服务时间 */ - @NotNull(message = "终止服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class }) @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date serviceEndTime; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java index 044d8ae3f0..4dfe1df9b2 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditSocietyOrgFormDTO.java @@ -67,6 +67,12 @@ public class EditSocietyOrgFormDTO implements Serializable { */ @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Edit.class}) private String mobile; + + /** + * 服务时间 + */ + @NotBlank(message = "服务时间不能为空",groups = {Edit.class}) + private String serviceTimeStr; /** * 起始服务时间 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java index 0edc99c42f..08404eff6d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java @@ -56,6 +56,10 @@ public class GetListSocietyOrgResultDTO implements Serializable { private String personInCharge; //负责人电话 private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; //起始服务时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java index b5ed492b5d..2d77374893 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java @@ -47,6 +47,10 @@ public class SocietyOrgListResultDTO implements Serializable { private String personInCharge; //负责人电话 private String mobile; + /** + * 服务时间 + */ + private String serviceTimeStr; //起始服务时间 //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") //private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java index cc694cd625..20cd08c3b1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java @@ -73,6 +73,11 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity { private String mobile; /** + * 服务时间 + */ + private String serviceTimeStr; + + /** * 起始服务时间 */ private Date serviceStartTime; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 08725a6a1c..800d2e447c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -131,7 +131,9 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO)); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml index 9ac12b6b1a..4939225de6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcSocietyOrgDao.xml @@ -12,6 +12,7 @@ service_matters serviceMatters, person_in_charge personInCharge, mobile mobile, + service_time_str, service_start_time serviceStartTime, service_end_time serviceEndTime, admin_staff_id adminStaffId,