|
@@ -914,7 +914,8 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
|
|
|
registrationCode = StrUtil.isNotEmpty(registrationCode) ? registrationCode.replace(illegalChars, "-") : "[电梯注册代码]";
|
|
|
useCompanyCode = useCompanyCode != null ? useCompanyCode : "";
|
|
|
//保养单及图片文件夹 dir/i.ProjectName-RegistrationCode/
|
|
|
- String imgDir = StrUtil.format("{}{}{}.{}-{}-{}{}", dir, File.separator, (i + 1), projectName, registrationCode, useCompanyCode, File.separator);
|
|
|
+ String imgDir = StrUtil.format("{}{}{}.{}-{}-", dir, File.separator, (i + 1), projectName, registrationCode);
|
|
|
+ imgDir += useCompanyCode + File.separator;
|
|
|
//生成维保图片
|
|
|
List<MtRecordImg> mtRecordImgs = mtRecordResponse.getMtRecordImgs();
|
|
|
List<MtRecordImg> imgs = mtRecordImgs.stream().filter(img -> mtRecordResponse.getId().equals(img.getMtRecordId())).collect(Collectors.toList());
|
|
@@ -953,8 +954,11 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
|
|
|
if (entity == null) {
|
|
|
throw new ValidateException("维保记录不存在");
|
|
|
}
|
|
|
- String repairDuration = this.getRepairDuration(entity.getRepairDiff());
|
|
|
- entity.setRepairDuration(repairDuration);
|
|
|
+ if (entity.getRepairDiff() != null) {
|
|
|
+ String repairDuration = this.getRepairDuration(entity.getRepairDiff());
|
|
|
+ entity.setRepairDuration(repairDuration);
|
|
|
+ }
|
|
|
+ entity.setRepairDuration("");
|
|
|
Validate.notNull(entity, ValuePool.MAINTENANCE_RECORD_NOT_EXIST);
|
|
|
/**
|
|
|
* 维保项id:0/1/2, 0:无需保养,1:已保养,2:需要更换
|