设施和环境条件要求、辅助工时bug解决

chenrui

2025-03-13 0a23b2e16cc875ae6616c268a87ef8545b1b0edc

设施和环境条件要求、辅助工时bug解决

 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());
        }

 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;
        }