Merge branch 'feature-wcz' of lift-manager/lift-server into develop

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

@@ -54,7 +54,7 @@ public class AnnualInspectionController {
         Long id = request.getId();
         Judge.id(id);
         InspectionResponse entity = annualInspectionService.selectByIdWithInfo(request);
-        return Judge.result(entity);
+        return RestResponse.success(entity);
     }
 
     /**
@@ -83,7 +83,7 @@ public class AnnualInspectionController {
         Long workerId = request.getWorkerId();
         Judge.id(workerId);
         IPage<InspectionResponse> pages = annualInspectionService.pageByCondition(request);
-        return Judge.result(pages);
+        return RestResponse.success(pages);
     }
     /**
      * @description 修改年检信息
@@ -213,7 +213,7 @@ public class AnnualInspectionController {
         entity.setStepName(stepName);
 
         boolean result = annualInspectionService.finish(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     @GetMapping("show")
@@ -238,7 +238,7 @@ public class AnnualInspectionController {
         Long userId = request.getUserId();
         Judge.id(userId);
         IPage<InspectionResponse> pages = annualInspectionService.pageByUser(request);
-        return Judge.result(pages);
+        return RestResponse.success(pages);
     }
 
     /**
@@ -255,7 +255,7 @@ public class AnnualInspectionController {
         entity.setStepStatus(Values.Ai.STATUS_CONFIRM);
         entity.setStepName(Values.Ai.STEP_ONE);
         boolean result = annualInspectionService.updateById(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -281,7 +281,7 @@ public class AnnualInspectionController {
         entity.setStepName(Values.Ai.STEP_ONE);
 
         boolean result = annualInspectionService.updateById(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -308,7 +308,7 @@ public class AnnualInspectionController {
         entity.setStepName(Values.Ai.STEP_THREE);
 
         boolean result = annualInspectionService.updateById(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -335,6 +335,6 @@ public class AnnualInspectionController {
         entity.setStepName(Values.Ai.STEP_FOUR);
 
         boolean result = annualInspectionService.updateById(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.*;
 import java.time.LocalDate;
@@ -31,37 +32,42 @@ public class AnnualInspection extends BaseEntity {
     /**
      * 电梯ID
      */
-    @Min(value = 1,message = "电梯不能为空")
+    @NotNull(message = "电梯不能为空")
+    @Range(min = 1,message = "电梯有误")
     private Long liftId;
 
     /**
      * 公司ID
      */
-    @Min(value = 1,message = "维保公司不能为空")
+    @NotNull(message = "维保公司不能为空")
+    @Range(min = 1,message = "维保公司有误")
     private Long mtCompanyId;
 
     /**
      * 计划年检时间
      */
-    @Future(message = "计划年检时间有误")
     @NotNull(message = "计划年检时间不能为空")
+    @Future(message = "计划年检时间有误")
     private LocalDate planDate;
 
     /**
      * 是否检查限速器（0 否；1 是；默认0）
      */
-    @Max(value = 1,message = "请设置是否检查限速器")
+    @NotNull(message = "请设置是否检查限速器")
+    @Range(max = 1,message = "是否检查限速器有误")
     private Integer isCheckGoverner;
 
     /**
      * 是否荷载年检设置（0 否；1 是；默认0）
      */
-    @Max(value = 1, message = "请设置是否荷载年检设置")
+    @NotNull(message = "请设置是否荷载年检设置")
+    @Range(max = 1, message = "荷载年检设置有误")
     private Integer loadInspectionSetting;
 
     /**
      * 完成时间
      */
+    @Past(message = "完成时间不合法")
     private LocalDateTime finishTime;
 
     /**
@@ -88,7 +94,8 @@ public class AnnualInspection extends BaseEntity {
     /**
      * 状态（0 待完成；1 已完成；2 超期）
      */
-    @Max(value = 2,message = "请确认正确的年检状态")
+    @NotNull(message = "请确认正确的年检状态")
+    @Range(max = 2,message = "年检状态有误")
     private Integer status;
 
     /**
@@ -139,14 +146,16 @@ public class AnnualInspection extends BaseEntity {
      9	企业文员确认年检报告和合格证-合格
      10	企业文员确认年检报告和合格证-不合格
      */
-    @Max(value = 10,message = "请确认正确的年检阶段状态")
+    @NotNull(message = "请确认正确的年检阶段状态")
+    @Range(max = 10,message = "年检阶段状态有误")
     private Integer stepStatus;
 
     /**
      * 年检阶段名称
      * 0 未开始; 1 第一阶段 1-2;2 第二阶段 3;3 第三阶段 4-7;4 第四阶段 8-10
      */
-    @Max(value = 4,message = "请确认正确的年检阶段名")
+    @NotNull(message = "请确认正确的年检阶段名")
+    @Range(max = 4,message = "年检阶段名有误")
     private Integer stepName;
 
 }

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

@@ -127,7 +127,7 @@ public class EmergencyRepairController {
         entity.setAssignTime(LocalDateTime.now());
         entity.setStatus(Values.Er.STATUS_TO_REPAIRED);
         boolean result = emergencyRepairService.save(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -142,7 +142,7 @@ public class EmergencyRepairController {
         Judge.notNull(pages);
         long count = pages.getTotal();
         CountPage<RepairResponse> countPage = new CountPage<>(count,pages);
-        return Judge.result(countPage);
+        return RestResponse.success(countPage);
     }
 
     /**
@@ -157,7 +157,7 @@ public class EmergencyRepairController {
         Judge.notNull(pages);
         long count = emergencyRepairService.countByCondition(request);
         CountPage<RepairResponse> countPage = new CountPage<>(count,pages);
-        return Judge.result(countPage);
+        return RestResponse.success(countPage);
     }
 
     /**
@@ -171,7 +171,7 @@ public class EmergencyRepairController {
         Long workerId = request.getWorkerId();
         Judge.id(workerId);
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
-        return Judge.result(pages);
+        return RestResponse.success(pages);
     }
 
     /**
@@ -195,7 +195,7 @@ public class EmergencyRepairController {
         entity.setWorkerId1(workerId);
 
         boolean result = emergencyRepairService.saveOrUpdate(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -220,7 +220,7 @@ public class EmergencyRepairController {
         entity.setStatus(Values.Er.STATUS_CLOSE);
 
         boolean result = emergencyRepairService.saveOrUpdate(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -233,7 +233,7 @@ public class EmergencyRepairController {
         Long userId = request.getUserId();
         Judge.id(userId);
         IPage<RepairResponse> pages = emergencyRepairService.pageByUser(request);
-        return Judge.result(pages);
+        return RestResponse.success(pages);
     }
 
     /**
@@ -259,7 +259,7 @@ public class EmergencyRepairController {
         entity.setStatus(Values.Er.STATUS_REPAIRING);
 
         boolean result = emergencyRepairService.taking(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -285,7 +285,7 @@ public class EmergencyRepairController {
         entity.setArriveTime(arriveTime);
 
         boolean result = emergencyRepairService.updateById(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -312,7 +312,7 @@ public class EmergencyRepairController {
         entity.setSafetyConfirm(safetyConfirm);
 
         boolean result = emergencyRepairService.updateById(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -338,7 +338,7 @@ public class EmergencyRepairController {
         repair.setCostTotal(costTotal);
 
         boolean result = emergencyRepairService.costAdd(repair,erCostItems);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -368,7 +368,7 @@ public class EmergencyRepairController {
         repair.setCostTotal(repair.getCostTotal().subtract(erCostItem.getCostMoney()));
 
         boolean result = emergencyRepairService.costDelete(repair,erCostItem);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -393,7 +393,7 @@ public class EmergencyRepairController {
         repair.setCostTotal(costTotal);
 
         boolean result = emergencyRepairService.costModify(repair,erCostItems);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -408,7 +408,7 @@ public class EmergencyRepairController {
             return RestResponse.success(liftFaultService.list());
         }
         List<LiftFault> lists = liftFaultService.listByLiftCategory(liftCategory);
-        return Judge.result(lists);
+        return RestResponse.success(lists);
     }
 
     /**
@@ -494,7 +494,7 @@ public class EmergencyRepairController {
         evaluation.setPostDate(LocalDateTime.now());
 
         boolean result = evaluationService.save(evaluation);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -540,7 +540,7 @@ public class EmergencyRepairController {
         entity.setStatus(Values.Er.STATUS_FINISH);
 
         boolean result = emergencyRepairService.repairOrder(entity,erRecordImgs);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     @PostMapping("listImages")
@@ -549,7 +549,7 @@ public class EmergencyRepairController {
         Judge.id(id);
         List<ErRecordImg> lists = erRecordImgService.listByErRecordId(id);
         Judge.notNull(lists);
-        return Judge.result(lists);
+        return RestResponse.success(lists);
     }
 
     /**
@@ -564,6 +564,6 @@ public class EmergencyRepairController {
         Long projectId = request.getProjectId();
         Judge.ids(liftId,mtCompanyId,projectId);
         IPage<RepairResponse> pages = emergencyRepairService.pageByCompanyLiftProject(request);
-        return Judge.result(pages);
+        return RestResponse.success(pages);
     }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
@@ -31,31 +32,36 @@ public class EmergencyRepair extends BaseEntity {
     /**
      * 公司ID
      */
-    @Min(value = 1,message = "维保公司不能为空")
+    @NotNull(message = "维保公司不能为空")
+    @Range(min = 1,message = "维保公司有误")
     private Long mtCompanyId;
 
     /**
      * 电梯ID
      */
-    @Min(value = 1,message = "电梯不能为空")
+    @NotNull(message = "电梯不能为空")
+    @Range(min = 1,message = "电梯有误")
     private Long liftId;
 
     /**
      * 项目id
      */
-    @Min(value = 1,message = "项目不能为空")
+    @NotNull(message = "项目不能为空")
+    @Range(min = 1,message = "项目有误")
     private Long projectId;
 
     /**
      * 是否关人
      */
-    @Max(value = 1, message = "请确认是否关人")
+    @NotNull(message = "请确认是否关人")
+    @Range(max = 1,message = "请确认是否关人")
     private Integer isTrapped;
 
     /**
      * 是否紧急（0 否；1 是）
      */
-    @Max(value = 1, message = "请确认是否紧急")
+    @NotNull(message = "请确认是否紧急")
+    @Range(max = 1, message = "请确认是否紧急")
     private Integer isCritical;
 
     /**
@@ -66,7 +72,8 @@ public class EmergencyRepair extends BaseEntity {
     /**
      * 报修来源（1 物业；2 维保；3 物联）
      */
-    @Max(value = 3, message = "请确认报修来源")
+    @NotNull(message = "请确认报修来源")
+    @Range(min = 1, max = 3,message = "请确认报修来源")
     private Integer source;
 
     /**
@@ -90,31 +97,37 @@ public class EmergencyRepair extends BaseEntity {
      * 报修时间 手动填写
      */
     @NotNull(message = "报修时间不能为空")
+    @Past(message = "报修时间不合法")
     private LocalDateTime callerDate;
 
     /**
      * 停梯时间
      */
+    @Past(message = "停梯时间不合法")
     private LocalDateTime stopDate;
 
     /**
      * 派单时间 急修单创建时间
      */
+    @Past(message = "派单时间不合法")
     private LocalDateTime assignTime;
 
     /**
      * 接单时间 app端维保工确认
      */
+    @Past(message = "接单时间不合法")
     private LocalDateTime takingTime;
 
     /**
      *
      * 到达时间 app端维保工打卡
      */
+    @Past(message = "到达时间不合法")
     private LocalDateTime arriveTime;
     /**
      * 恢复时间
      */
+    @Past(message = "恢复时间不合法")
     private LocalDateTime recoveryDate;
 
     /**
@@ -176,7 +189,8 @@ public class EmergencyRepair extends BaseEntity {
     /**
      * 急修原因（0 其他；1 停电；2 故障）
      */
-    @NotEmpty(message = "急修原因不能为空")
+    @NotNull(message = "急修原因不能为空")
+    @Range(min = 0,max = 2,message = "急修原因有误")
     private Integer repairReason;
 
     /**
@@ -192,7 +206,8 @@ public class EmergencyRepair extends BaseEntity {
     /**
      * 当前维修的维保工
      */
-    @Min(value = 1,message = "急修工不能为空")
+    @NotNull(message = "急修工不能为空")
+    @Range(min = 1,message = "急修工有误")
     private Long workerId1;
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AnnouncementController.java

@@ -50,7 +50,7 @@ public class AnnouncementController {
         AnnouncementResponse entity = announcementService.findByIdWithInfo(request);
         Judge.notNull(entity);
         entity.setImgs(announcementImgService.listByAnnouncement(id));
-        return Judge.result(entity);
+        return RestResponse.success(entity);
     }
 
     /**
@@ -65,7 +65,7 @@ public class AnnouncementController {
         Judge.notNull(pages);
         long count = announcementService.count();
         CountPage<AnnouncementResponse> countPage = new CountPage<>(count, pages);
-        return Judge.result(countPage);
+        return RestResponse.success(countPage);
     }
 
     /**
@@ -77,7 +77,7 @@ public class AnnouncementController {
     @PostMapping("add")
     public RestResponse add(@Valid @RequestBody Announcement entity) {
         boolean result = announcementService.add(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -91,7 +91,7 @@ public class AnnouncementController {
         Long id = request.getId();
         Judge.id(id);
         boolean result = announcementService.removeById(id);
-        return Judge.result(result);
+        return RestResponse.success(result);
 
     }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -54,7 +54,7 @@ public class AttendanceController {
         AttendanceResponse entity = attendanceService.findByIdWithInfo(request);
         Judge.notNull(entity);
         entity.setImgs(attendanceImgService.listByAttendance(id));
-        return Judge.result(entity);
+        return RestResponse.success(entity);
     }
 
     /**
@@ -69,7 +69,7 @@ public class AttendanceController {
         Judge.notNull(pages);
         long count = attendanceService.count();
         CountPage<AttendanceResponse> countPage = new CountPage<>(count, pages);
-        return Judge.result(countPage);
+        return RestResponse.success(countPage);
     }
 
     /**
@@ -108,7 +108,7 @@ public class AttendanceController {
         entity.setDownTimeOt(downTimeOt);
 
         boolean result = maintenanceCompanyService.saveOrUpdate(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -173,7 +173,7 @@ public class AttendanceController {
                 return RestResponse.failParam();
         }
         boolean result = attendanceService.save(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -187,7 +187,7 @@ public class AttendanceController {
         Long mtCompanyId = request.getMtCompanyId();
         Judge.id(mtCompanyId);
         MaintenanceCompany entity = maintenanceCompanyService.getById(mtCompanyId);
-        return Judge.result(entity);
+        return RestResponse.success(entity);
     }
 
     /**
@@ -201,6 +201,6 @@ public class AttendanceController {
         Long userId = request.getUserId();
         Judge.id(userId);
         IPage<AttendanceResponse> pages = attendanceService.pageByUser(request);
-        return Judge.result(pages);
+        return RestResponse.success(pages);
     }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/LiftCertificateController.java

@@ -46,7 +46,7 @@ public class LiftCertificateController {
         Long id = request.getId();
         Judge.id(id);
         LiftCertificateResponse entity = liftCertificateService.findByIdWithInfo(request);
-        return Judge.result(entity);
+        return RestResponse.success(entity);
     }
 
     /**
@@ -62,7 +62,7 @@ public class LiftCertificateController {
         IPage<LiftCertificateResponse> pages = liftCertificateService.pageByCondition(request);
         Judge.notNull(pages);
         CountPage<LiftCertificateResponse> countPage = new CountPage<>(count, pages);
-        return Judge.result(countPage);
+        return RestResponse.success(countPage);
     }
 
     /**
@@ -80,7 +80,7 @@ public class LiftCertificateController {
         LiftCertificate certificate = liftCertificateService.findByUserAndMtCompany(id,ownerId,mtCompanyId);
         Judge.notNull(certificate,Values.Lc.CertNotExist);
         boolean result = liftCertificateService.updateById(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -100,7 +100,7 @@ public class LiftCertificateController {
         int status = request.isPass() ? Values.Lc.Status_AuditPass : Values.Lc.Status_AuditFail;
         liftCertificate.setStatus(status);
         boolean result = liftCertificateService.saveOrUpdate(liftCertificate);
-        return Judge.result(result);
+        return RestResponse.success(result);
     }
 
     /**
@@ -120,7 +120,7 @@ public class LiftCertificateController {
         entity.setStatus(Values.Lc.Status_ToAudit);
 
         boolean result = liftCertificateService.saveOrUpdate(entity);
-        return Judge.result(result);
+        return RestResponse.success(result);
 
     }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/Announcement.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -33,19 +33,20 @@ public class Announcement extends BaseEntity {
     /**
      * 公司ID
      */
-    @Min(value = 1,message = "维保公司不能为空")
+    @NotNull(message = "维保公司不能为空")
+    @Range(min = 1,message = "维保公司有误")
     private Long mtCompanyId;
 
     /**
      * 标题
      */
-    @NotNull(message = "标题不能为空")
+    @NotNull(message = "公告标题不能为空")
     private String title;
 
     /**
      * 内容
      */
-    @NotNull(message = "内容不能为空")
+    @NotNull(message = "公告内容不能为空")
     private String content;
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/AnnouncementImg.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -29,7 +29,8 @@ public class AnnouncementImg implements Serializable {
     /**
      * 公告ID
      */
-    @Min(value = 1,message = "公告不能为空")
+    @NotNull(message = "公告不能为空")
+    @Range(min = 1,message = "公告有误")
     private Long announcementId;
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/Attendance.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -30,7 +30,8 @@ public class Attendance extends BaseEntity {
     /**
      * 公司ID
      */
-    @Min(value = 1,message = "维保公司不能为空")
+    @NotNull(message = "维保公司不能为空")
+    @Range(min = 1,message = "维保公司有误")
     private Long mtCompanyId;
 
     /**
@@ -58,6 +59,8 @@ public class Attendance extends BaseEntity {
     /**
      * 状态（是否迟到早退，0：否，1：是）
      */
+    @NotNull(message = "打卡状态不能为空")
+    @Range(max = 1,message = "请指定打卡状态")
     private Integer status;
 
     /**
@@ -67,5 +70,6 @@ public class Attendance extends BaseEntity {
      * 31 加班上班 32 加班下班
      */
     @NotNull(message = "请指定打卡类型")
+    @Range(min = 11,max = 32,message = "打卡类型有误")
     private Integer type;
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/AttendanceImg.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
@@ -29,7 +29,8 @@ public class AttendanceImg implements Serializable {
     /**
      * 打卡记录ID
      */
-    @Min(value = 1,message = "打卡记录不能为空")
+    @NotNull(message = "打卡记录不能为空")
+    @Range(min = 1,message = "打卡记录有误")
     private Long attendanceId;
 
     /**

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/LiftCertificate.java

@@ -3,9 +3,8 @@ package cn.com.ty.lift.enterprise.oa.entity;
 import cn.com.ty.lift.enterprise.config.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
+import org.hibernate.validator.constraints.Range;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
 
@@ -28,13 +27,15 @@ public class LiftCertificate extends BaseEntity {
     /**
      * 拥有者ID
      */
-    @Min(value = 1,message = "缺少操作证拥有者")
+    @NotNull(message = "拥有者不能为空")
+    @Range(min = 1,message = "拥有者有误")
     private Long ownerId;
 
     /**
      * 维保公司id
      */
-    @Min(value = 1,message = "缺少维保公司")
+    @NotNull(message = "维保公司不能为空")
+    @Range(min = 1,message = "维保公司有误")
     private Long mtCompanyId;
 
     /**
@@ -74,7 +75,8 @@ public class LiftCertificate extends BaseEntity {
     /**
      * 0：无证，1：待审核，2：审核未通过，3：审核通过，4：超期
      */
-    @Max(value = 4, message = "操作证状态有误")
+    @NotNull(message = "操作证状态不能为空")
+    @Range(max = 4, message = "操作证状态有误")
     private Integer status;
     
 }