Browse Source

打开了按需保养的功能,保养间隔还是限定在15天以内

别傲 5 years ago
parent
commit
a9c1a904c3

+ 0 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MaintenancePlanRequest.java

@@ -113,7 +113,6 @@ public class MaintenancePlanRequest extends PageRequest {
      */
     @NotNull(message = "维保间隔不能为空")
     @Min(value = 1, message = "维保间隔最小值为1")
-    @Max(value = 15, message = "维保间隔最大值为15")
     private Integer interval;
 
     /**

+ 5 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -28,7 +28,6 @@ import cn.com.ty.lift.common.utils.DateUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -232,6 +231,11 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
      * @date 2019/12/16 2:14 PM
      */
     public RestResponse insertBatch(MaintenancePlanRequest request) {
+        String demand = request.getDemand();
+        if ("0".equals(demand)) {
+            Integer interval = request.getInterval();
+            if (interval > 15) return RestResponse.fail("维保间隔最大值为15");
+        }
         List<MaintenancePlan> planList = request.getPlanList();
         boolean result = preJudgment(planList, request.getFirstTime());
         if (!result) {