|
@@ -905,10 +905,12 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
|
|
|
//处理文件夹路径
|
|
|
String projectName = mtRecordResponse.getProjectName();
|
|
|
String registrationCode = mtRecordResponse.getRegistrationCode();
|
|
|
+ String useCompanyCode = mtRecordResponse.getUseCompanyCode();
|
|
|
projectName = StrUtil.isNotEmpty(projectName) ? projectName.replace(illegalChars, "-") : "[项目]";
|
|
|
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, File.separator);
|
|
|
+ String imgDir = StrUtil.format("{}{}{}.{}-{}-{}{}", dir, File.separator, (i + 1), projectName, registrationCode, useCompanyCode, File.separator);
|
|
|
//生成维保图片
|
|
|
List<MtRecordImg> mtRecordImgs = mtRecordResponse.getMtRecordImgs();
|
|
|
List<MtRecordImg> imgs = mtRecordImgs.stream().filter(img -> mtRecordResponse.getId().equals(img.getMtRecordId())).collect(Collectors.toList());
|