fix(ys):代码调整

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/YsEmergencyExpertsServiceImpl.java

@@ -117,7 +117,12 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert
             EasyExcel.read(file.getInputStream(), ExpertImportVo.class, new AnalysisEventListener<ExpertImportVo>() {
                 @Override
                 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
@@ -127,13 +132,6 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert
 
             excelReader.finish();
 
-            // 完善创建信息
-            dataList.forEach(x -> {
-                x.setCreateDate(new Date());
-                x.setCreateUserName(userModel.getUserName());
-                x.setCreateUserId(userModel.getUserId());
-            });
-
             // 保存数据
             this.saveOrUpdateBatch(dataList);
 

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/service/impl/YsEmergencyRehearsalServiceImpl.java

@@ -137,7 +137,12 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe
             EasyExcel.read(file.getInputStream(), RehearsalImportVo.class, new AnalysisEventListener<RehearsalImportVo>() {
                 @Override
                 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
@@ -147,13 +152,6 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe
 
             excelReader.finish();
 
-            // 完善创建信息
-            dataList.forEach(x -> {
-                x.setCreateDate(new Date());
-                x.setCreateUserName(userModel.getUserName());
-                x.setCreateUserId(userModel.getUserId());
-            });
-
             // 保存数据
             this.saveOrUpdateBatch(dataList);