Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/service/IYsEmergencyExpertsService.java

@@ -17,13 +17,13 @@ import java.util.Map;
  */
 public interface IYsEmergencyExpertsService {
 
-    Boolean saveOrUpdate (Map<String, Object> model, AgencyUserModel userModel);
+    Boolean saveOrUpdate(Map<String, Object> model, AgencyUserModel userModel);
 
-    Boolean deleteById (String sequenceNbr);
+    Boolean deleteById(String sequenceNbr);
 
-    YsEmergencyExpertsDto queryBySequenceNbr (String sequenceNbr);
+    YsEmergencyExpertsDto queryBySequenceNbr(String sequenceNbr);
 
-    ResponseModel<Object> expertDataImport(MultipartFile file);
+    ResponseModel<Object> expertDataImport(MultipartFile file, AgencyUserModel userModel);
 
     void export(HttpServletResponse response, List<String> ids);
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-api/src/main/java/com/yeejoin/amos/boot/module/ys/api/service/IYsEmergencyRehearsalService.java

@@ -25,7 +25,7 @@ public interface IYsEmergencyRehearsalService {
 
     YsEmergencyRehearsalDto detailBySeq(String sequenceNbr);
 
-    ResponseModel<Object> expertDataImport(MultipartFile file);
+    ResponseModel<Object> expertDataImport(MultipartFile file, AgencyUserModel userModel);
 
     Page<YsEmergencyRehearsalDto> queryForYsEmergencyRehearsalPage(Page<YsEmergencyRehearsalDto> page, YsEmergencyRehearsalDto dto);
 }

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/YsEmergencyExpertsController.java

@@ -141,7 +141,10 @@ public class YsEmergencyExpertsController extends BaseController {
 				!("xls".equalsIgnoreCase(fileExtension) || "xlsx".equalsIgnoreCase(fileExtension))) {
 			return ResponseHelper.buildResponse("文件类型必须是 Excel 文件");
 		}
-		return ysEmergencyExpertsServiceImpl.expertDataImport(file);
+
+		AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
+
+		return ysEmergencyExpertsServiceImpl.expertDataImport(file,userModel);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-tzs/amos-boot-module-ys/amos-boot-module-ys-biz/src/main/java/com/yeejoin/amos/boot/module/ys/biz/controller/YsEmergencyRehearsalController.java

@@ -138,7 +138,8 @@ public class YsEmergencyRehearsalController extends BaseController {
                 !("xls".equalsIgnoreCase(fileExtension) || "xlsx".equalsIgnoreCase(fileExtension))) {
             return ResponseHelper.buildResponse("文件类型必须是 Excel 文件");
         }
-        return ysEmergencyRehearsalServiceImpl.expertDataImport(file);
+        AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
+        return ysEmergencyRehearsalServiceImpl.expertDataImport(file,userModel);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -102,7 +102,7 @@ public class YsEmergencyExpertsServiceImpl extends BaseService<YsEmergencyExpert
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseModel<Object> expertDataImport(MultipartFile file) {
+    public ResponseModel<Object> expertDataImport(MultipartFile file,AgencyUserModel userModel) {
         try {
             InputStream inputStream = file.getInputStream();
             ExcelReader excelReader = EasyExcel.read(inputStream).build();
@@ -128,6 +128,13 @@ 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

@@ -43,7 +43,7 @@ import java.util.List;
  * @date 2024-09-24
  */
 @Service
-public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehearsalDto,YsEmergencyRehearsal,YsEmergencyRehearsalMapper> implements IYsEmergencyRehearsalService {
+public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehearsalDto, YsEmergencyRehearsal, YsEmergencyRehearsalMapper> implements IYsEmergencyRehearsalService {
 
     @Autowired
     YsEmergencyRehearsalMapper ysEmergencyRehearsalMapper;
@@ -51,15 +51,15 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe
     /**
      * 分页查询
      */
-    public Page<YsEmergencyRehearsalDto> queryForYsEmergencyRehearsalPage(Page<YsEmergencyRehearsalDto> page)   {
+    public Page<YsEmergencyRehearsalDto> queryForYsEmergencyRehearsalPage(Page<YsEmergencyRehearsalDto> page) {
         return this.queryForPage(page, null, false);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<YsEmergencyRehearsalDto> queryForYsEmergencyRehearsalList()   {
-        return this.queryForList("" , false);
+    public List<YsEmergencyRehearsalDto> queryForYsEmergencyRehearsalList() {
+        return this.queryForList("", false);
     }
 
     @Override
@@ -79,8 +79,8 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe
     @Override
     public Boolean deleteBySeq(String sequenceNbr) {
         LambdaUpdateWrapper<YsEmergencyRehearsal> lambda = new UpdateWrapper<YsEmergencyRehearsal>().lambda();
-        lambda.eq(YsEmergencyRehearsal::getSequenceNbr,sequenceNbr);
-        lambda.set(YsEmergencyRehearsal::getIsDelete,Boolean.TRUE);
+        lambda.eq(YsEmergencyRehearsal::getSequenceNbr, sequenceNbr);
+        lambda.set(YsEmergencyRehearsal::getIsDelete, Boolean.TRUE);
         return this.update(lambda);
     }
 
@@ -121,7 +121,7 @@ public class YsEmergencyRehearsalServiceImpl extends BaseService<YsEmergencyRehe
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseModel<Object> expertDataImport(MultipartFile file) {
+    public ResponseModel<Object> expertDataImport(MultipartFile file, AgencyUserModel userModel) {
         try {
             InputStream inputStream = file.getInputStream();
             ExcelReader excelReader = EasyExcel.read(inputStream).build();
@@ -147,6 +147,13 @@ 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);