From ce49c308e7453c10ea1274deeed24d2a68b8730e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 23 Sep 2022 13:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E9=9A=8F=E8=AE=BF=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=8A=A0=E5=85=A5=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E9=BB=98=E8=AE=A4=E5=B1=85=E5=AE=B6=E9=9A=94?= =?UTF-8?q?=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java | 7 +++++-- .../java/com/epmet/dto/form/VaccinationListFormDTO.java | 3 +++ .../com/epmet/dto/result/VaccinationListResultDTO.java | 3 +++ .../com/epmet/entity/IcEpidemicSpecialAttentionEntity.java | 2 +- .../impl/IcEpidemicSpecialAttentionServiceImpl.java | 4 ++++ .../db/migration/V0.0.72__icepidemic_ISOLATED_STATE .sql | 1 + 6 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.72__icepidemic_ISOLATED_STATE .sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java index fddaa92fc9..5d880153a6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEpidemicSpecialAttentionDTO.java @@ -62,13 +62,16 @@ public class IcEpidemicSpecialAttentionDTO implements Serializable { private String isHistory; /** - * 隔离类型,来自字典表 + * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3 */ // @NotBlank(message = "isolatedState不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private String isolatedState; /** - * 关注类型，核酸检测：2，疫苗接种：1，行程上报：0 + * 关注类型， + * 核酸检测：2， + * 疫苗接种：1， + * 行程上报：0 */ @NotNull(message = "attentionType不能为空",groups = {IcEpidemicSpecialAttentionAdd.class,IcEpidemicSpecialAttentionUpdate.class}) private Integer attentionType; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java index 66742465ad..cc06182a72 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VaccinationListFormDTO.java @@ -24,6 +24,9 @@ public class VaccinationListFormDTO extends PageFormDTO implements Serializable @NotNull(message = "attentionType不能为空",groups = VaccinationListForm.class) private Integer attentionType; + /** + * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3 + */ private String isolatedState; private String isHistory; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java index b85a16a0d7..7099e1650b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java @@ -117,6 +117,9 @@ public class VaccinationListResultDTO implements Serializable { * 小区名+楼栋名+单元名+房屋名 */ private String allName; + /** + * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3 + */ private String isolatedState; private String id; private String userId; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java index b4eb253957..a22f3f3537 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEpidemicSpecialAttentionEntity.java @@ -49,7 +49,7 @@ public class IcEpidemicSpecialAttentionEntity extends BaseEpmetEntity { private String isHistory; /** - * 隔离类型,来自字典表 + * 隔离类型,来自字典表;集中隔离：0;居家隔离1;居家健康监测2;已出隔离期3 */ private String isolatedState; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 25a3a82403..65070ee096 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -309,6 +309,10 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl