Browse Source

Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev

dev
yinzuomei 3 years ago
parent
commit
60c781971d
  1. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java
  2. 1
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java
  3. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java
  4. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java
  5. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

4
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java

@ -227,7 +227,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
* @return * @return
*/ */
@PostMapping("import") @PostMapping("import")
public Result importExcel(MultipartFile file) { public Result importExcel(@LoginUser TokenDto tokenDto, MultipartFile file) {
String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID); String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
// 1.暂存文件 // 1.暂存文件
@ -271,7 +271,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
"行程上报导入失败"); "行程上报导入失败");
// 3.执行导入 // 3.执行导入
icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId());
return new Result(); return new Result();
} }
} }

1
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java

@ -21,6 +21,7 @@ public class IcNatImportExcelData {
@NotBlank(message = "手机号为必填项") @NotBlank(message = "手机号为必填项")
@ExcelProperty("手机号") @ExcelProperty("手机号")
@Length(max = 15, message = "手机号长度不正确,应小于15位")
private String mobile; private String mobile;
@NotBlank(message = "身份证号为必填项") @NotBlank(message = "身份证号为必填项")

3
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java

@ -23,11 +23,12 @@ public class IcVaccineImportExcelData implements Serializable {
@NotBlank(message = "手机号为必填项") @NotBlank(message = "手机号为必填项")
@ExcelProperty("手机号") @ExcelProperty("手机号")
@Length(max = 15, message = "手机号长度不正确")
private String mobile; private String mobile;
@NotBlank(message = "身份证号为必填项") @NotBlank(message = "身份证号为必填项")
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
@Length(max = 18, message = "身份证号长度不正确,应小于18位") @Length(max = 18, message = "身份证号长度不正确")
private String idCard; private String idCard;
@NotNull(message = "接种时间为必填项") @NotNull(message = "接种时间为必填项")

2
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java

@ -99,5 +99,5 @@ public interface IcTripReportRecordService extends BaseService<IcTripReportRecor
* 执行Excel导入 * 执行Excel导入
* @param filePath * @param filePath
*/ */
void execAsyncExcelImport(Path filePath, String importTaskId); void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId);
} }

6
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@ -334,12 +334,8 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
@Async @Async
@Override @Override
public void execAsyncExcelImport(Path filePath, String importTaskId) { public void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId) {
String userId = null;
String customerId=null;
try { try {
userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
customerId = EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID);
//获取当前登录用户所属组织id //获取当前登录用户所属组织id
CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(customerId,userId); CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(customerId,userId);

Loading…
Cancel
Save