给所有的excle导入添加了当前模拟的操作人

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/KeySiteServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteDto;
 import com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto;
@@ -264,11 +265,23 @@ public class KeySiteServiceImpl extends BaseService<KeySiteDto, KeySite, KeySite
 			} else {
 				keySiteDto.setFirePreventionFlag(false);
 			}
+			keySiteDto =Bean.toPo(getCurrentInfo(), keySiteDto);
 			excelList.add(keySiteDto);
 		}
 		return this.saveBatch(excelList);
 	}
-
+	public BaseEntity getCurrentInfo() {
+		BaseEntity userModel= new BaseEntity();
+	/*		String keyString=	RequestContext.getExeUserId();
+	String token=RequestContext.getToken();
+		ReginParams params = JSONObject.parseObject(redisUtils
+				.get(RedisKey.buildReginKey(keyString, token)).toString(),
+				ReginParams.class);*/
+		userModel.setRecUserId("3141675");		
+		userModel.setRecUserName("admin_jcs");
+		userModel.setRecDate( new Date());
+		return userModel;
+	}
 	@Override
 	public List<OrgMenuDto> getBuildAndKeyTree(Long sequenceNbr) {
 		LambdaQueryWrapper<KeySite> mapper =new LambdaQueryWrapper<KeySite>();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -310,6 +310,7 @@ public class ExcelServiceImpl {
 				} else {
 					continue;
 				}
+				positionStaffDto = Bean.toPo(getCurrentInfo(),positionStaffDto);		
 				specialPositionStaffServiceImpl.createWithModel(positionStaffDto);
 			}
 		}
@@ -346,7 +347,7 @@ public class ExcelServiceImpl {
 				} else {
 					continue;
 				}
-
+				rescueEquipmentDto = Bean.toPo(getCurrentInfo(),rescueEquipmentDto);
 				rescueEquipmentServiceImpl.createWithModel(rescueEquipmentDto);
 			}
 
@@ -355,8 +356,8 @@ public class ExcelServiceImpl {
 
 	private void excelImportLinkageUnitZhDto(MultipartFile multipartFile) throws Exception {
 		List<LinkageUnitDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, LinkageUnitDto.class, 1);
-
-		if (excelDtoList != null && excelDtoList.size() > 0) {
+		
+if (excelDtoList != null && excelDtoList.size() > 0) {
 			excelDtoList.forEach(linkageUnitDto -> {
 				if (linkageUnitDto.getLinkageUnitType() != null) {
 					String[] certificates = linkageUnitDto.getLinkageUnitType().split("@");
@@ -368,7 +369,7 @@ public class ExcelServiceImpl {
 					linkageUnitDto.setEmergencyLinkageUnit(certificates[0]);
 					linkageUnitDto.setEmergencyLinkageUnitCode(certificates[1]);
 				}
-
+				linkageUnitDto =Bean.toPo(getCurrentInfo(),linkageUnitDto);
 				linkageUnitServiceImpl.saveLinkageModel(linkageUnitDto);
 			});
 		}
@@ -490,9 +491,8 @@ public class ExcelServiceImpl {
 					dynamicFormInstancelist.add(dynamicFormInstance);
 
 				});
-
 				orgUsrExcelDto.setDynamicFormValue(dynamicFormInstancelist);
-
+				Bean.toPo(getCurrentInfo(),orgUsrExcelDto);
 				try {
 					orgUsrService.saveOrgPersonExcel(orgUsrExcelDto);
 				} catch (Exception e) {
@@ -732,6 +732,7 @@ public class ExcelServiceImpl {
 		excelDtoList.forEach(fireExpertsDto -> {
 			FireExperts fireExperts = new FireExperts();
 			fireExperts = Bean.toPo(fireExpertsDto, fireExperts);
+			fireExperts = Bean.toPo(getCurrentInfo(),fireExperts);
 			if (fireExperts.getCertificatesType() != null) {
 				String[] certificates = fireExperts.getCertificatesType().split("@");
 				fireExperts.setCertificatesType(certificates[0]);
@@ -895,6 +896,7 @@ public class ExcelServiceImpl {
 			// 先填充主表的属性
 			MaintenanceCompany maintenanceCompany = new MaintenanceCompany();
 			maintenanceCompany = Bean.toPo(maintenancePersonExcleDto, maintenanceCompany);
+			maintenanceCompany = Bean.toPo(getCurrentInfo(),maintenanceCompany);
 			maintenanceCompany.setType(PERSON);
 			if (maintenanceCompany.getParentId() != null) {
 				long getParentId = Long.valueOf(maintenancePersonExcleDto.getParentName().split("@")[1]);