From 9d7f33a07f3334cacdbdb037434b41c63c4b5775 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 8 Apr 2022 16:03:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B8=E9=85=B8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E3=80=81=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=95=BF=E5=BA=A615?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/excel/data/IcNatImportExcelData.java | 1 + .../main/java/com/epmet/excel/data/IcVaccineImportExcelData.java | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java index 385d02b171..052b0cb1eb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java @@ -21,6 +21,7 @@ public class IcNatImportExcelData { @NotBlank(message = "手机号为必填项") @ExcelProperty("手机号") + @Length(max = 15, message = "手机号长度不正确，应小于15位") private String mobile; @NotBlank(message = "身份证号为必填项") diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java index 6dca8bc4bb..f85b77091b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java @@ -23,6 +23,7 @@ public class IcVaccineImportExcelData implements Serializable { @NotBlank(message = "手机号为必填项") @ExcelProperty("手机号") + @Length(max = 15, message = "手机号长度不正确，应小于15位") private String mobile; @NotBlank(message = "身份证号为必填项") From 7dfbcb60cea4ee27bfc9e5890de833d62b50a3e6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 8 Apr 2022 16:22:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/data/IcVaccineImportExcelData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java index f85b77091b..60a83b2582 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java @@ -23,12 +23,12 @@ public class IcVaccineImportExcelData implements Serializable { @NotBlank(message = "手机号为必填项") @ExcelProperty("手机号") - @Length(max = 15, message = "手机号长度不正确，应小于15位") + @Length(max = 15, message = "手机号长度不正确") private String mobile; @NotBlank(message = "身份证号为必填项") @ExcelProperty("身份证号") - @Length(max = 18, message = "身份证号长度不正确，应小于18位") + @Length(max = 18, message = "身份证号长度不正确") private String idCard; @NotNull(message = "接种时间为必填项") From af5bd46923988b45a9adb807d1c163932301ee31 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 8 Apr 2022 16:48:33 +0800 Subject: [PATCH 3/3] tokenqu --- .../com/epmet/controller/IcTripReportRecordController.java | 4 ++-- .../java/com/epmet/service/IcTripReportRecordService.java | 2 +- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 663b425f4e..f6b0df98cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java @@ -227,7 +227,7 @@ public class IcTripReportRecordController implements ResultDataResolver { * @return */ @PostMapping("import") - public Result importExcel(MultipartFile file) { + public Result importExcel(@LoginUser TokenDto tokenDto, MultipartFile file) { String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); // 1.暂存文件 @@ -271,7 +271,7 @@ public class IcTripReportRecordController implements ResultDataResolver { "行程上报导入失败"); // 3.执行导入 - icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); + icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId()); return new Result(); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index 66ec0d9f9e..ffd9f3db8d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -99,5 +99,5 @@ public interface IcTripReportRecordService extends BaseService