From 0a23b2e16cc875ae6616c268a87ef8545b1b0edc Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 17:32:16 +0800
Subject: [PATCH] 设施和环境条件要求、辅助工时bug解决
---
cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java | 2 +-
performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
index 48c0369..1d39939 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/controller/FeLightningProtectionController.java
@@ -40,7 +40,7 @@
public Result<?> addLightningProtectionDetection(FeLightningProtection feLightningProtection,
@RequestPart(value = "file", required = false) MultipartFile file) {
if (ObjectUtils.isNotEmpty(file)) {
- String s = FileSaveUtil.StoreFile(file);
+ String s = FileSaveUtil.uploadWordFile(file);
feLightningProtection.setSystemFileName(s);
feLightningProtection.setFileName(file.getOriginalFilename());
}
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
index b9f48d0..1880de8 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/AuxiliaryWorkingHoursDayServiceImpl.java
@@ -104,7 +104,7 @@
} else {
IPage<AuxiliaryWorkingHoursDayDto> auxiliaryWorkingHoursDayDtoIPage = auxiliaryWorkingHoursDayMapper.selectAuxiliaryWorkingHoursDay(page, QueryWrappers.queryWrappers(auxiliaryWorkingHoursDayDto), ids);
for (AuxiliaryWorkingHoursDayDto record : auxiliaryWorkingHoursDayDtoIPage.getRecords()) {
- record.setDateTime(record.getDateTime().substring(0, 10));
+ record.setDateTime(ObjectUtils.isEmpty(record.getDateTime())? null : record.getDateTime().substring(0, 10));
}
return auxiliaryWorkingHoursDayDtoIPage;
}
--
Gitblit v1.9.3