[chg] 多文件上传使用link确认顺序，去掉急修，达到时间，停梯时间，接单时间，恢复时间和当前时间校验，年检阶段：自检，报检，场检和确认

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -177,7 +177,7 @@ public class AnnualInspectionController {
      * 修改年检信息
      * <p>
      * status 状态（0 待完成；1 已完成；2 超期）
-     * stepStatus  :年检阶段状态- 第一阶段 1-2，第二阶段 3，第三阶段 4-7，第四阶段 8-10
+     * stepStatus  :年检阶段状态- 第一阶段（自检） 1-2，第二阶段（报检） 3，第三阶段（场检） 4-7，第四阶段（确认） 8-10
      * stepName : 当前能操作的阶段
      * <p>
      * 1  维保工确认年检计划
@@ -205,7 +205,7 @@ public class AnnualInspectionController {
         AnnualInspection old = annualInspectionService.findByMtCompanyId(entity.getId(), entity.getMtCompanyId());
         Validate.notNull(old, ValuePool.INSPECTION_NOT_EXIST);
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 1);
-        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionOptionOnStageIllegal("第一阶段"));
+        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionOptionOnStageIllegal(ValuePool.INSPECTION_STEP_ONE_DESC));
         old.setIsCheckGoverner(entity.getIsCheckGoverner());
         old.setLoadInspectionSetting(entity.getLoadInspectionSetting());
 
@@ -227,9 +227,9 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 1);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 2);
         Integer stepStatus = entity.getStepStatus();
-        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionStepToNextIllegal("确认操作", "第一阶段"));
-        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.inspectionCurrentStepStatusIllegal( oldStepStatus, "第一阶段"));
-        Validate.equals(stepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.inspectionNewStepStatusIllegal(stepStatus, "第一阶段"));
+        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionStepToNextIllegal(ValuePool.INSPECTION_STEP_ZERO_DESC, ValuePool.INSPECTION_STEP_ONE_DESC));
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.inspectionCurrentStepStatusIllegal( oldStepStatus, ValuePool.INSPECTION_STEP_ONE_DESC));
+        Validate.equals(stepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.inspectionNewStepStatusIllegal(stepStatus, ValuePool.INSPECTION_STEP_ONE_DESC));
 
         old.setSelfcheckReportImg(entity.getSelfcheckReportImg());
         old.setSelfcheckDate(entity.getSelfcheckDate());
@@ -252,8 +252,8 @@ public class AnnualInspectionController {
         Validate.notNull(old, ValuePool.INSPECTION_NOT_EXIST);
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 2);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 2);
-        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_ONE,ValuePool.INSPECTION_STEP_TWO, ValuePool.inspectionStepToNextIllegal("第一阶段", "第二阶段"));
-        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, "第二阶段"));
+        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_ONE,ValuePool.INSPECTION_STEP_TWO, ValuePool.inspectionStepToNextIllegal(ValuePool.INSPECTION_STEP_ONE_DESC, ValuePool.INSPECTION_STEP_TWO_DESC));
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, ValuePool.INSPECTION_STEP_TWO_DESC));
 
         old.setCheckDate(entity.getCheckDate());
         old.setInspector(entity.getInspector());
@@ -307,9 +307,9 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 2);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 3);
         Integer stepStatus = entity.getStepStatus();
-        Validate.between(oldStepName,ValuePool.INSPECTION_STEP_TWO, ValuePool.INSPECTION_STEP_THREE, ValuePool.inspectionStepToNextIllegal("第二阶段", "第三阶段"));
-        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, "第三阶段"));
-        Validate.between(stepStatus, ValuePool.INSPECTION_STAGE_UPLOAD_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, ValuePool.inspectionNewStepStatusIllegal(stepStatus, "第三阶段"));
+        Validate.between(oldStepName,ValuePool.INSPECTION_STEP_TWO, ValuePool.INSPECTION_STEP_THREE, ValuePool.inspectionStepToNextIllegal(ValuePool.INSPECTION_STEP_TWO_DESC, ValuePool.INSPECTION_STEP_THREE_DESC));
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, ValuePool.INSPECTION_STEP_THREE_DESC));
+        Validate.between(stepStatus, ValuePool.INSPECTION_STAGE_UPLOAD_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, ValuePool.inspectionNewStepStatusIllegal(stepStatus, ValuePool.INSPECTION_STEP_THREE_DESC));
         LocalDate oldPlanDate = old.getPlanDate();
         if(Objects.nonNull(oldPlanDate)){
             LocalDate deadline = oldPlanDate.plusDays(DateUtils.daysOfYear());
@@ -345,9 +345,9 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 3);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 5);
         Integer stepStatus = entity.getStepStatus();
-        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_THREE, ValuePool.INSPECTION_STEP_FOUR, ValuePool.inspectionStepToNextIllegal("第三阶段", "第四阶段"));
-        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CHECK_QUALIFIED, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, "第四阶段"));
-        Validate.between(stepStatus, ValuePool.INSPECTION_STAGE_UPLOAD_CERT_REPORT, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, ValuePool.inspectionNewStepStatusIllegal(stepStatus, "第四阶段"));
+        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_THREE, ValuePool.INSPECTION_STEP_FOUR, ValuePool.inspectionStepToNextIllegal(ValuePool.INSPECTION_STEP_THREE_DESC, ValuePool.INSPECTION_STEP_FOUR_DESC));
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CHECK_QUALIFIED, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, ValuePool.INSPECTION_STEP_FOUR_DESC));
+        Validate.between(stepStatus, ValuePool.INSPECTION_STAGE_UPLOAD_CERT_REPORT, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, ValuePool.inspectionNewStepStatusIllegal(stepStatus, ValuePool.INSPECTION_STEP_FOUR_DESC));
 
         old.setStepStatus(entity.getStepStatus());
         old.setAnnualInspectionImg(entity.getAnnualInspectionImg());
@@ -390,10 +390,10 @@ public class AnnualInspectionController {
         Validate.notNull(entity, ValuePool.INSPECTION_NOT_EXIST);
         //1 判断年检完成状态 0
         Integer status = ValuePool.nullable(entity.getStatus(), 0);
-        Validate.equals(status, ValuePool.INSPECTION_STATUS_TO_DO, ValuePool.inspectionCurrentStepStatusIllegal(status, "上传自检报告"));
+        Validate.equals(status, ValuePool.INSPECTION_STATUS_TO_DO, ValuePool.inspectionCurrentStepStatusIllegal(status, ValuePool.INSPECTION_STEP_ONE_DESC));
         //2 判断年检阶段状态 1
         Integer stepName = ValuePool.nullable(entity.getStepName(), 1);
-        Validate.equals(stepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传自检报告"));
+        Validate.equals(stepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionCurrentStepStatusIllegal(stepName, ValuePool.INSPECTION_STEP_ONE_DESC));
 
         entity.setSelfcheckDate(request.getSelfcheckDate());
         entity.setSelfcheckReportImg(request.getSelfcheckReportImg());
@@ -417,10 +417,10 @@ public class AnnualInspectionController {
         Validate.notNull(entity, ValuePool.INSPECTION_NOT_EXIST);
         //1 判断年检完成状态 0
         Integer status = ValuePool.nullable(entity.getStatus(), 0);
-        Validate.equals(status, ValuePool.INSPECTION_STATUS_TO_DO, ValuePool.inspectionCurrentStepStatusIllegal(status, "上传检验结果"));
+        Validate.equals(status, ValuePool.INSPECTION_STATUS_TO_DO, ValuePool.inspectionCurrentStepStatusIllegal(status, ValuePool.INSPECTION_STEP_THREE_DESC));
         //2 判断年检阶段状态 3
         Integer stepName = ValuePool.nullable(entity.getStepName(), 3);
-        Validate.equals(stepName, ValuePool.INSPECTION_STEP_THREE, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传检验结果"));
+        Validate.equals(stepName, ValuePool.INSPECTION_STEP_THREE, ValuePool.inspectionCurrentStepStatusIllegal(stepName, ValuePool.INSPECTION_STEP_THREE_DESC));
 
         entity.setCheckDate(request.getCheckDate());
         entity.setCheckResultImg(request.getCheckResultImg());
@@ -444,10 +444,10 @@ public class AnnualInspectionController {
         Validate.notNull(entity, ValuePool.INSPECTION_NOT_EXIST);
         //1 判断年检完成状态 0
         Integer status = ValuePool.nullable(entity.getStatus(), 0);
-        Validate.equals(status, ValuePool.INSPECTION_STATUS_TO_DO, ValuePool.inspectionCurrentStepStatusIllegal(status, "上传年检报告和合格证"));
+        Validate.equals(status, ValuePool.INSPECTION_STATUS_TO_DO, ValuePool.inspectionCurrentStepStatusIllegal(status, ValuePool.INSPECTION_STEP_FOUR_DESC));
         //2 判断年检阶段状态 4
         Integer stepName = ValuePool.nullable(entity.getStepName(), 4);
-        Validate.equals(stepName, ValuePool.INSPECTION_STEP_FOUR, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传年检报告和合格证"));
+        Validate.equals(stepName, ValuePool.INSPECTION_STEP_FOUR, ValuePool.inspectionCurrentStepStatusIllegal(stepName, ValuePool.INSPECTION_STEP_FOUR_DESC));
 
         entity.setCertificateImgUrl(request.getCertificateImgUrl());
         entity.setAnnualInspectionImg(request.getAnnualInspectionImg());

lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonController.java

@@ -87,7 +87,7 @@ public class CommonController {
     @PostMapping("uploads")
     public RestResponse uploads(@RequestParam("files") MultipartFile[] files) {
         Validate.notTrue(ArrayUtil.isEmpty(files), ValuePool.UPLOAD_DATA_MISSING);
-        Map<String, MultipartFile> fileMap = new HashMap<>();
+        Map<String, MultipartFile> fileMap = new LinkedHashMap<>();
         //1 先解析文件格式
         for (MultipartFile file : files) {
             String fileName = handleFile(file);

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/dto/RepairRequest.java

@@ -88,7 +88,7 @@ public class RepairRequest extends PageRequest {
      * 接单时间 app端维保工确认
      */
     @NotNull(message = "缺少接单时间")
-    @PastOrPresent(message = "接单时间不能早于标准北京时间")
+//    @PastOrPresent(message = "接单时间不能早于标准北京时间")
     private LocalDateTime takingTime;
 
     /**
@@ -96,14 +96,14 @@ public class RepairRequest extends PageRequest {
      * 到达时间 app端维保工打卡
      */
     @NotNull(message = "缺少到达时间")
-    @PastOrPresent(message = "到达时间不能早于标准北京时间")
+//    @PastOrPresent(message = "到达时间不能早于标准北京时间")
     private LocalDateTime arriveTime;
 
     /**
      * 停梯时间
      */
     @NotNull(message = "缺少停梯时间")
-    @PastOrPresent(message = "停梯时间不能早于标准北京时间")
+//    @PastOrPresent(message = "停梯时间不能早于标准北京时间")
     private LocalDateTime stopDate;
 
     /**
@@ -177,7 +177,7 @@ public class RepairRequest extends PageRequest {
      * 恢复时间
      */
     @NotNull(message = "缺少恢复时间")
-    @PastOrPresent(message = "恢复时间不得早于标准北京时间")
+//    @PastOrPresent(message = "恢复时间不得早于标准北京时间")
     private LocalDateTime recoveryDate;
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MtPlanRequest.java

@@ -58,4 +58,5 @@ public class MtPlanRequest extends PageRequest {
      */
     @Min(value = 1, message = "维保公司ID有误")
     private Long mtCompanyId;
+
 }

lift-common/src/main/java/cn.com.ty.lift.common/utils/ValuePool.java

@@ -129,6 +129,11 @@ public interface ValuePool {
      * 年检 第一阶段
      */
     int    INSPECTION_STEP_ONE                      = 1;
+    String INSPECTION_STEP_ZERO_DESC                = "确认操作";
+    String INSPECTION_STEP_ONE_DESC                 = "自检阶段";
+    String INSPECTION_STEP_TWO_DESC                 = "报检阶段";
+    String INSPECTION_STEP_THREE_DESC               = "场检阶段";
+    String INSPECTION_STEP_FOUR_DESC                = "确认阶段";
     /**
      * 年检 第二阶段
      */

lift-upload/src/main/java/com/upload/controller/UploadController.java

@@ -39,7 +39,7 @@ public class UploadController {
     @PostMapping("uploads")
     public RestResponse uploads(@RequestParam("files") MultipartFile[] files) {
         Validate.notTrue(ArrayUtil.isEmpty(files), ValuePool.UPLOAD_DATA_MISSING);
-        Map<String, MultipartFile> fileMap = new HashMap<>();
+        Map<String, MultipartFile> fileMap = new LinkedHashMap<>();
         //1 先解析文件格式
         for (MultipartFile file : files) {
             String fileName = handleFile(file);