From ca3842b0022ea568da8a282a57116a96873267ff Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 3 Nov 2022 17:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E9=9A=94=E7=A6=BB=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E5=85=B8=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.26__alter_dict.sql | 5 --- .../commons/tools/enums/DictTypeEnum.java | 1 - .../impl/IcTripReportRecordServiceImpl.java | 34 +++++++++--------- .../excel/ps_trip_report_import_template.xlsx | Bin 11192 -> 11209 bytes 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql index f01ae19551..10b2bf3ea5 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.26__alter_dict.sql @@ -12,7 +12,6 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` -- 字典表新增数据【自己的】 INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000001', 'traffic_type', '交通方式', '交通方式【行程上报】', '36', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000002', 'sojourn_history', '7天内旅居史情况', '7天内旅居史情况【行程上报】', '37', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000003', 'isolate_type', '隔离状态', '隔离状态【行程上报】', '38', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2100000000000000004', 'trip_data_type', '行程记录类型', '行程记录类型【行程上报】', '39', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); @@ -25,10 +24,6 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000002', '2100000000000000002', '中风险', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000003', '2100000000000000002', '低风险', '0', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5200000000000000004', '2100000000000000002', '无风险', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000001', '2100000000000000003', '集中隔离', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000002', '2100000000000000003', '居家隔离', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000003', '2100000000000000003', '居家健康检测', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5300000000000000004', '2100000000000000003', '不需要隔离', '4', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000001', '2100000000000000004', '省内', '1', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000002', '2100000000000000004', '省外', '2', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5400000000000000003', '2100000000000000004', '市内', '3', '0', '', '0', '0', '0', 'APP_USER', '2022-10-31 18:23:27', 'APP_USER', '2022-10-31 18:23:27'); 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 d38442798e..a07838684d 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 @@ -33,7 +33,6 @@ public enum DictTypeEnum { DANGER_AREA_LEVEL_TYPE("dangerAreaLevel", "风险地区等级", 34), TRAFFIC_TYPE("traffic_type", "交通方式", 36), SOJOURN_HISTORY("sojourn_history", "7天内旅居史情况", 37), - ISOLATE_TYPE("isolate_type", "隔离状态", 38), TRIP_DATA_TYPE("trip_data_type", "行程记录类型", 39), ; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 5db0b44648..a5e811f000 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -130,9 +130,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -166,7 +166,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); //Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - //Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); //Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -433,7 +433,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> trafficTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRAFFIC_TYPE.getCode()); //7天内旅居史情况 Result> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); + //隔离状态【磐石的跟之前字典表值不一样】 + Map isolateTypeMap = new HashMap<>(); + isolateTypeMap.put("0", "集中隔离");isolateTypeMap.put("1", "居家隔离");isolateTypeMap.put("2", "居家健康监测");isolateTypeMap.put("3", "已出隔离期");isolateTypeMap.put("4", "不需要隔离"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); @@ -614,7 +615,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl> sojournHistoryMap = adminOpenFeignClient.dictMap(DictTypeEnum.SOJOURN_HISTORY.getCode()); Map sMap = sojournHistoryMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); - //隔离状态 - Result> isolateTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map iMap = isolateTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); + //隔离状态【磐石的跟之前字典表值不一样】 + Map iMap = new HashMap<>(); + iMap.put("集中隔离", "0");iMap.put("居家隔离", "1");iMap.put("居家健康监测", "2");iMap.put("已出隔离期", "3");iMap.put("不需要隔离", "4"); //行程记录类型 Result> tripDataTypeMap = adminOpenFeignClient.dictMap(DictTypeEnum.TRIP_DATA_TYPE.getCode()); Map tdMap = tripDataTypeMap.getData().entrySet().stream().collect(Collectors.toMap(entry -> entry.getValue(), entry -> entry.getKey())); @@ -760,8 +761,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl sojournMap = sojournMapRes.success() && CollectionUtils.isNotEmpty(sojournMapRes.getData()) ? sojournMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); // 隔离状态字典 - Result> isolateMapRes = adminOpenFeignClient.dictDataList(DictTypeEnum.ISOLATE_TYPE.getCode()); - Map isolateMap = isolateMapRes.success() && CollectionUtils.isNotEmpty(isolateMapRes.getData()) ? isolateMapRes.getData().stream().collect(Collectors.toMap(SysDictDataDTO::getDictValue, SysDictDataDTO::getDictLabel)) : new HashMap<>(); + Map isolateMap = new HashMap<>(); + isolateMap.put("0", "集中隔离");isolateMap.put("1", "居家隔离");isolateMap.put("2", "居家健康监测");isolateMap.put("3", "已出隔离期");isolateMap.put("4", "不需要隔离"); + if (CollectionUtils.isNotEmpty(result.getList())){ result.getList().forEach(l -> { l.setIsolateTypeName(isolateMap.get(l.getIsolateType())); diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ps_trip_report_import_template.xlsx index 186dee0bf753fba81f65cebf36e84a3ef9374e85..88ee9650a459b7e69e8589f4117a4da20d13ce2f 100644 GIT binary patch delta 2843 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