[chg] 年检阶段操作数据检查,急修操作返回提示信息

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

@@ -272,8 +272,7 @@ public class AnnualInspectionController {
             old.setStepStatus(3);
             old.setStepName(2);//转回阶段2
         }
-        RestResponse result = annualInspectionService.stepThree(old, entity.getProjectId(), entity.getIsCheckGoverner(), entity.getLoadInspectionSetting());
-        return result;
+        return annualInspectionService.stepThree(old, entity.getProjectId(), entity.getIsCheckGoverner(), entity.getLoadInspectionSetting());
     }
 
     /**
@@ -289,7 +288,7 @@ public class AnnualInspectionController {
         Integer oldStepName = old.getStepName();
         Integer oldStepStatus = old.getStepStatus();
         Integer stepStatus = entity.getStepStatus();
-        Verify.isTrue(oldStepName == 3, "请进行第三阶段操作");
+        Verify.isTrue(oldStepName == 3 || oldStepName == 4, "请进行第三阶段操作");
         Verify.isTrue(oldStepStatus >= 5 && oldStepStatus <= 10, "请进行第四阶段操作");
         Verify.isTrue(stepStatus >= 8 && stepStatus <= 10, "请进行第四阶段操作");
 
@@ -310,8 +309,7 @@ public class AnnualInspectionController {
         }
         old.setStepName(4);
 
-        RestResponse result = annualInspectionService.stepFour(old);
-        return result;
+        return annualInspectionService.stepFour(old);
     }
     /**
      * 修改年检信息
@@ -339,7 +337,7 @@ public class AnnualInspectionController {
      * @param entity AnnualInspection
      * @return RestResponse
      */
-    @PostMapping("modify")
+//    @PostMapping("modify")
     public RestResponse modify(@Valid @RequestBody AnnualInspection entity) {
         //1 维保工确认年检计划, 新增年检记录
         if(Verify.Inspection.statusConfirm(entity.getStatus())){

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

@@ -120,13 +120,13 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         boolean up = updateById(entity);
         //更新失败，直接返回false
         if (!up) {
-            return RestResponse.fail("更新年检失败");
+            return RestResponse.fail("更新年检失败，请稍后重试");
         }
         Long mtCompanyId = entity.getMtCompanyId();
         Long liftId = entity.getLiftId();
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
         if (null == relevance) {
-            return RestResponse.fail("平台公司电梯关联信息不存在");
+            return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //如果电梯在急修中，关掉急修，开始年检
         if (relevance.getLiftCompanyStatus().equals(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode())) {
@@ -138,7 +138,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
                 boolean cl = emergencyRepairService.updateById(repair);
                 if (!cl) {
                     rollback();
-                    return RestResponse.fail("关闭急修失败");
+                    return RestResponse.fail("关闭急修失败，请稍后重试");
                 }
             }
         }
@@ -147,14 +147,14 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         if(!re){
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("修改电梯业务状态失败");
+            return RestResponse.fail("修改电梯业务状态失败，请稍后重试");
         }
         //todo: 更新电梯中下一次年检信息
         //电梯不存在，说明数据有误，直接返回false
         Lift lift = liftService.getById(liftId);
         if (null == lift) {
             rollback();
-            return RestResponse.fail("关联电梯不存在");
+            return RestResponse.fail("关联电梯不存在，请核查");
         }
         //更新电梯之前获取旧的年检时间
         LocalDate oldInspectionDate = lift.getAnnualInspectionDate();
@@ -168,7 +168,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         //更新电梯失败，返回false
         if (!li) {
             rollback();
-            return RestResponse.fail("更新电梯下一次年检信息失败");
+            return RestResponse.fail("更新电梯下一次年检信息失败，请稍后重试");
         }
         //更新电梯成功，插入电梯操作记录
         LiftHistory liftHistory = new LiftHistory();
@@ -187,7 +187,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
             return RestResponse.success(true);
         } else {
             rollback();
-            return RestResponse.fail("添加电梯操作日志失败");
+            return RestResponse.fail("添加电梯操作日志失败，请稍后重试");
         }
     }
     /**
@@ -201,7 +201,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         boolean up = updateById(entity);
         //更新失败，直接返回false
         if (!up) {
-            return RestResponse.fail("更新年检失败");
+            return RestResponse.fail("更新年检失败，请稍后重试");
         }
         Integer stepStatus = entity.getStepStatus();
         Long mtCompanyId = entity.getMtCompanyId();
@@ -209,7 +209,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
 
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
         if (null == relevance) {
-            return RestResponse.fail("平台公司电梯关联信息不存在");
+            return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //todo 不合格：流程结束，电梯扭转到不合格状态列表，电梯停保，清理维保计划记录
         if (Verify.Inspection.statusCertificateReportUnqualified(stepStatus)) {
@@ -218,7 +218,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
             boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
             if(!re){
                 rollback();
-                return RestResponse.fail("修改电梯业务状态失败");
+                return RestResponse.fail("修改电梯业务状态失败，请稍后重试");
             }
 
             boolean mp = maintenancePlanService.cleanPlan(mtCompanyId, liftId);
@@ -227,7 +227,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
             } else {
                 //强制手动事务回滚
                 rollback();
-                return RestResponse.fail("清除电梯维保计划失败");
+                return RestResponse.fail("清除电梯维保计划失败，请稍后重试");
             }
         }
         //todo:合格：修改电梯的业务状态为正常
@@ -239,7 +239,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
                 return RestResponse.success(true);
             }else{
                 rollback();
-                return RestResponse.fail("修改电梯业务状态失败");
+                return RestResponse.fail("修改电梯业务状态失败，请稍后重试");
             }
         }
         return RestResponse.success(true);

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

@@ -102,11 +102,11 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     public RestResponse taking(EmergencyRepair entity) {
         boolean er = updateById(entity);
         if (!er) {
-            return RestResponse.fail("修改急修失败");
+            return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(entity.getMtCompanyId(), entity.getLiftId());
         if (null == relevance) {
-            return RestResponse.fail("平台公司电梯关联信息不存在");
+            return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态改成急修中
         relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode());
@@ -116,7 +116,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         } else {
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("修改电梯业务状态失败");
+            return RestResponse.fail("修改电梯业务状态失败，请稍后重试");
         }
     }
 
@@ -204,11 +204,11 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         emergencyRepair.setStatus(Verify.Repair.STATUS_STOPING);
         boolean er = updateById(emergencyRepair);
         if (!er) {
-            return RestResponse.fail("修改急修失败");
+            return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
         if (null == relevance) {
-            return RestResponse.fail("平台公司电梯关联信息不存在");
+            return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态改成维保中
         relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.MAINTENANCE.getCode());
@@ -218,7 +218,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         } else {
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("修改电梯业务状态失败");
+            return RestResponse.fail("修改电梯业务状态失败，请稍后重试");
         }
     }
 
@@ -243,11 +243,11 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         emergencyRepair.setStatus(Verify.Repair.STATUS_REPAIRING);
         boolean er = updateById(emergencyRepair);
         if (!er) {
-            return RestResponse.fail("修改急修失败");
+            return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
         if (null == relevance) {
-            return RestResponse.fail("平台公司电梯关联信息不存在");
+            return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态改成急修中
         relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode());
@@ -257,7 +257,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         } else {
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("修改电梯业务状态失败");
+            return RestResponse.fail("修改电梯业务状态失败，请稍后重试");
         }
     }
 
@@ -274,7 +274,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         Verify.notNull(erRecordImgs);
         boolean re = saveOrUpdate(repair);
         if (!re) {
-            return RestResponse.fail("修改急修失败");
+            return RestResponse.fail("修改急修失败，请稍后重试");
         }
         boolean im = erRecordImgService.saveBatch(erRecordImgs);
         if (im) {
@@ -282,7 +282,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         } else {
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("插入急修图片失败");
+            return RestResponse.fail("插入急修图片失败，请稍后重试");
         }
     }
 
@@ -297,7 +297,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     public RestResponse addCost(EmergencyRepair repair, List<ErRecordCost> erRecordCosts) {
         boolean re = saveOrUpdate(repair);
         if (!re) {
-            return RestResponse.fail("修改急修失败");
+            return RestResponse.fail("修改急修失败，请稍后重试");
         }
         boolean er = erRecordCostService.saveBatch(erRecordCosts);
         if (er) {
@@ -305,7 +305,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         } else {
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("插入急修收费项失败");
+            return RestResponse.fail("插入急修收费项失败，请稍后重试");
         }
     }
 
@@ -320,7 +320,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     public RestResponse modifyCost(EmergencyRepair repair, List<ErRecordCost> erRecordCosts) {
         boolean re = saveOrUpdate(repair);
         if (!re) {
-            return RestResponse.fail("修改急修失败");
+            return RestResponse.fail("修改急修失败，请稍后重试");
         }
         //先删除原有的收费项，再添加新的
 //        List<ErRecordCost> costs = erRecordCostService.listByErRecordId(repair.getId());
@@ -334,7 +334,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         } else {
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("修改急修收费项失败");
+            return RestResponse.fail("修改急修收费项失败，请稍后重试");
         }
     }
 
@@ -349,7 +349,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     public RestResponse deleteCost(EmergencyRepair repair, ErRecordCost erRecordCost) {
         boolean er = erRecordCostService.removeById(erRecordCost.getId());
         if (!er) {
-            return RestResponse.fail("修改急修失败");
+            return RestResponse.fail("修改急修失败，请稍后重试");
         }
         boolean re = updateById(repair);
         if (re) {
@@ -357,7 +357,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         } else {
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("删除急修收费项失败");
+            return RestResponse.fail("删除急修收费项失败，请稍后重试");
         }
     }
 
@@ -372,7 +372,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     public RestResponse evaluate(EmergencyRepair repair, Evaluation entity) {
         boolean ev = evaluationService.save(entity);
         if (!ev) {
-            return RestResponse.fail("插入评价失败");
+            return RestResponse.fail("插入评价失败，请稍后重试");
         }
         boolean re = updateById(repair);
         if (re) {
@@ -380,7 +380,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         } else {
             //强制手动事务回滚
             rollback();
-            return RestResponse.fail("更新急修评价状态失败");
+            return RestResponse.fail("更新急修评价状态失败，请稍后重试");
         }
     }
 
@@ -388,11 +388,11 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     public RestResponse close(EmergencyRepair repair){
         boolean er = updateById(repair);
         if(!er){
-            return RestResponse.fail("修改急修失败");
+            return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(repair.getMtCompanyId(), repair.getLiftId());
         if (null == relevance) {
-            return RestResponse.fail("平台公司电梯关联信息不存在");
+            return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态如果在急修中 改成正常
         if(relevance.getLiftCompanyStatus().equals(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode())){
@@ -401,7 +401,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             if (!re) {
                 //强制手动事务回滚
                 rollback();
-                return RestResponse.fail("修改电梯业务状态是不");
+                return RestResponse.fail("修改电梯业务状态失败，请稍后重试");
             }
         }
         return RestResponse.success(true);