优化维保记录导出，文件夹名

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -44,7 +44,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.base.Splitter;
-import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -89,7 +88,6 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
     private ProjectLiftRelevanceService projectLiftRelevanceService;
     private MaintenanceOptionMapper maintenanceOptionMapper;
     private MaintenancePlanMapper maintenancePlanMapper;
-    private Gson gson;
     MaintenanceOptionService maintenanceOptionService;
 
     @Autowired
@@ -260,10 +258,10 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         //若保养时间在计划时间之前，则需要修改维保计划
         //boolean compareResult = request.getCurrentTime().isBefore(plan.getPlanDate());
         //if (compareResult) {
-            boolean modifyPlan = modifyPlan(request);
-            if (!modifyPlan) {
-                return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-            }
+        boolean modifyPlan = modifyPlan(request);
+        if (!modifyPlan) {
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
         //}
         Optional<Lift> lift = liftService.getOne(null, liftId);
         if (lift.isPresent()) {
@@ -916,8 +914,7 @@ 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);
-                imgDir += useCompanyCode + File.separator;
+                String imgDir = StrUtil.format("{}{}.{}-{}", dir + File.separator, useCompanyCode, projectName, registrationCode + File.separator);
                 //生成维保图片
                 List<MtRecordImg> mtRecordImgs = mtRecordResponse.getMtRecordImgs();
                 List<MtRecordImg> imgs = mtRecordImgs.stream().filter(img -> mtRecordResponse.getId().equals(img.getMtRecordId())).collect(Collectors.toList());