Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

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

@@ -145,7 +145,7 @@ public class AnnualInspectionController {
      * stepName: 1
      */
     @PostMapping("confirm")
-    @Validation(fields = {"liftId","mtCompanyId","planDate","isCheckGoverner","loadInspectionSetting"})
+    @Validation(fields = {"id", "liftId","mtCompanyId","planDate","isCheckGoverner","loadInspectionSetting"})
     public RestResponse confirm(@Val @RequestBody AnnualInspection entity){
         AnnualInspection sameConfirm = annualInspectionService.sameConfirm(entity.getLiftId(), entity.getMtCompanyId(), entity.getPlanDate());
         if(Objects.nonNull(sameConfirm)){
@@ -163,8 +163,12 @@ public class AnnualInspectionController {
         entity.setStatus(ValuePool.INSPECTION_STATUS_TO_DO);
         entity.setStepStatus(ValuePool.INSPECTION_STAGE_CONFIRM);
         entity.setStepName(ValuePool.INSPECTION_STEP_ONE);
-        boolean ai = annualInspectionService.saveOrUpdate(entity);
-        return RestResponse.success(ai);
+        boolean ai = annualInspectionService.save(entity);
+        if (ai) {
+            return RestResponse.success(entity.getId());
+        } else {
+            return RestResponse.fail();
+        }
     }
     /**
      * 修改年检信息
@@ -314,7 +318,7 @@ public class AnnualInspectionController {
             old.setStepStatus(ValuePool.INSPECTION_STAGE_CONFIRM_CHECK);
             old.setStepName(ValuePool.INSPECTION_STEP_TWO);//转回阶段2
             old.setCheckResultImg("");
-            old.setNextInspectionTime(LocalDate.of(1970, 1,1));
+            old.setNextInspectionTime(LocalDate.MIN);
         }
         return annualInspectionService.stepThree(old, entity.getProjectId(), entity.getIsCheckGoverner(), entity.getLoadInspectionSetting());
     }
@@ -364,23 +368,6 @@ public class AnnualInspectionController {
         return RestResponse.success(pages);
     }
 
-    /**
-     * 确认年检计划，传递年检id，后台修改年检状态，停止信息推送
-     *
-     * @param request InspectionRequest
-     * @return RestResponse
-     */
-//    @PostMapping("confirm")
-//    @Validation(fields = {"id"})
-//    public RestResponse confirm(@RequestBody InspectionRequest request) {
-//        AnnualInspection entity = annualInspectionService.getById(request.getId());
-//        Validate.notNull(entity);
-//        entity.setStepStatus(Validate.Inspection.STATUS_CONFIRM);
-//        entity.setStepName(Validate.Inspection.STEP_ONE);
-//        boolean result = annualInspectionService.updateById(entity);
-//        return RestResponse.success(result);
-//    }
-
     /**
      * 上传自检报告，传递年检id，传递自检报告图片路径
      * stepName = 1
@@ -392,7 +379,10 @@ public class AnnualInspectionController {
     public RestResponse selfcheck(@Val @RequestBody InspectionRequest request) {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         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, "上传自检报告"));
+        //2 判断年检阶段状态 1
         Integer stepName = ValuePool.nullable(entity.getStepName(), 1);
         Validate.equals(stepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传自检报告"));
 
@@ -416,7 +406,10 @@ public class AnnualInspectionController {
     public RestResponse check(@Val @RequestBody InspectionRequest request) {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         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, "上传检验结果"));
+        //2 判断年检阶段状态 3
         Integer stepName = ValuePool.nullable(entity.getStepName(), 3);
         Validate.equals(stepName, ValuePool.INSPECTION_STEP_THREE, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传检验结果"));
 
@@ -440,7 +433,10 @@ public class AnnualInspectionController {
     public RestResponse finish(@Val @RequestBody InspectionRequest request) {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         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, "上传年检报告和合格证"));
+        //2 判断年检阶段状态 4
         Integer stepName = ValuePool.nullable(entity.getStepName(), 4);
         Validate.equals(stepName, ValuePool.INSPECTION_STEP_FOUR, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传年检报告和合格证"));
 

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/entity/AnnualInspection.java

@@ -6,10 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.FutureOrPresent;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
@@ -29,6 +26,7 @@ public class AnnualInspection extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @Null(message = "年检ID必须为空")
     private Long id;
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/entity/EmergencyRepair.java

@@ -28,6 +28,7 @@ public class EmergencyRepair extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @Null(message = "急修ID必须为空")
     private Long id;
 
     /**