Commit 6aa5044e authored by 韩桐桐's avatar 韩桐桐

fix(ys):代码调整

parent 6bb010ab
...@@ -117,7 +117,12 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert ...@@ -117,7 +117,12 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert
EasyExcel.read(file.getInputStream(), ExpertImportVo.class, new AnalysisEventListener<ExpertImportVo>() { EasyExcel.read(file.getInputStream(), ExpertImportVo.class, new AnalysisEventListener<ExpertImportVo>() {
@Override @Override
public void invoke(ExpertImportVo data, AnalysisContext context) { public void invoke(ExpertImportVo data, AnalysisContext context) {
dataList.add(JSON.parseObject(JSON.toJSONString(data), YsEmergencyExperts.class)); YsEmergencyExperts emergencyExperts = JSON.parseObject(JSON.toJSONString(data), YsEmergencyExperts.class);
emergencyExperts.setIsDelete(Boolean.FALSE);
emergencyExperts.setCreateDate(new Date());
emergencyExperts.setCreateUserName(userModel.getUserName());
emergencyExperts.setCreateUserId(userModel.getUserId());
dataList.add(emergencyExperts);
} }
@Override @Override
...@@ -127,13 +132,6 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert ...@@ -127,13 +132,6 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert
excelReader.finish(); excelReader.finish();
// 完善创建信息
dataList.forEach(x -> {
x.setCreateDate(new Date());
x.setCreateUserName(userModel.getUserName());
x.setCreateUserId(userModel.getUserId());
});
// 保存数据 // 保存数据
this.saveOrUpdateBatch(dataList); this.saveOrUpdateBatch(dataList);
......
...@@ -137,7 +137,12 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe ...@@ -137,7 +137,12 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe
EasyExcel.read(file.getInputStream(), RehearsalImportVo.class, new AnalysisEventListener<RehearsalImportVo>() { EasyExcel.read(file.getInputStream(), RehearsalImportVo.class, new AnalysisEventListener<RehearsalImportVo>() {
@Override @Override
public void invoke(RehearsalImportVo data, AnalysisContext context) { public void invoke(RehearsalImportVo data, AnalysisContext context) {
dataList.add(JSON.parseObject(JSON.toJSONString(data), YsEmergencyRehearsal.class)); YsEmergencyRehearsal emergencyRehearsal = JSON.parseObject(JSON.toJSONString(data), YsEmergencyRehearsal.class);
emergencyRehearsal.setIsDelete(Boolean.FALSE);
emergencyRehearsal.setCreateDate(new Date());
emergencyRehearsal.setCreateUserName(userModel.getUserName());
emergencyRehearsal.setCreateUserId(userModel.getUserId());
dataList.add(emergencyRehearsal);
} }
@Override @Override
...@@ -147,13 +152,6 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe ...@@ -147,13 +152,6 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe
excelReader.finish(); excelReader.finish();
// 完善创建信息
dataList.forEach(x -> {
x.setCreateDate(new Date());
x.setCreateUserName(userModel.getUserName());
x.setCreateUserId(userModel.getUserId());
});
// 保存数据 // 保存数据
this.saveOrUpdateBatch(dataList); this.saveOrUpdateBatch(dataList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment