diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index 07d47ba7b0..fcf79a3c89 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -29,6 +29,10 @@ public enum DictTypeEnum { IC_DANGER_TYPE("ic_danger_type","危化品种类",24), POLICY_LEVEL("policy_level","政策级别",25), LOG_TYPE("log_type", "日志类型", 33), + TRAFFIC_TYPE("traffic_type", "日志类型", 36), + SOJOURN_HISTORY("sojourn_history", "日志类型", 37), + ISOLATE_TYPE("isolate_type", "日志类型", 38), + TRIP_DATA_TYPE("trip_data_type", "日志类型", 39), ; private final String code; diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index a8621ce09d..1d9190c9db 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -41,6 +41,10 @@ public interface ImportTaskConstants { * 行程上报 */ String BIZ_TYPE_IC_TRIP_REPORT = "ic_trip_report"; + /** + * 磐石-行程上报 + */ + String PS_BIZ_TYPE_IC_TRIP_REPORT = "ps_ic_trip_report"; /** * 处理状态:处理中 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java index 50aad8dad1..63d5d28ffa 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java @@ -247,7 +247,7 @@ public class IcTripReportRecordDTO implements Serializable { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -278,6 +278,10 @@ public class IcTripReportRecordDTO implements Serializable { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java index 34d1668c8d..6160420fee 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcTripReportFormDTO.java @@ -189,7 +189,7 @@ public class IcTripReportFormDTO implements Serializable { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -220,6 +220,10 @@ public class IcTripReportFormDTO implements Serializable { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java index 14b22ed70e..ffbfa4fe1f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java @@ -128,7 +128,7 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { */ private String sourceDetailAddress; /** - * 疫苗接种针次 (1针 2针 3针)【小寨子】 + * 疫苗接种针次 (0针 1针 2针 3针)【小寨子】 */ private String vaccineNum; /** @@ -159,6 +159,10 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity { * 是否落实"落地检" 0:否 1:是【磐石】 */ private String isArriveCheck; + /** + * 是否达到曹县 0:否 1:是【磐石】 + */ + private String isArrive; /** * 上报时间【磐石】 */