Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MaintenancePlan.java

@@ -64,7 +64,7 @@ public class MaintenancePlan extends BaseEntity {
 	private Integer type;
 
     /**
-     * 状态 0：待完成，1：已完成，2：超期
+     * 状态 0：待完成，1：已完成，-1：超期 2 保养中
      */
 	private Integer status;
 

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -115,9 +115,10 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
     /**
      * @param request 保养单信息
      * @return 是否成功
-     * @description 保存保养记录
+     * @description 新增保养记录
      * @date 2020/1/13 1:47 下午
      */
+    @Transactional(rollbackFor = Exception.class)
     public RestResponse saveRecord(MaintenanceRecordRequest request) {
         MaintenanceRecord record = request.getRecord();
         Long planId = record.getMtPlanId();
@@ -146,7 +147,15 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             if (!ret) {
                 return RestResponse.fail(MessageUtils.get("msg.add.fail"));
             }
-        } else return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+            plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.MAINTENANCE_DOING.getCode()));
+            boolean planResult = maintenancePlanService.updateById(plan);
+            if (!planResult){
+                rollback();
+                return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+            }
+        } else {
+            return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+        }
         return RestResponse.success(record.getId(), MessageUtils.get("msg.add.success"));
     }
 
@@ -156,6 +165,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      * @description 编辑保养信息
      * @date 2020/1/13 2:31 下午
      */
+    @Transactional(rollbackFor = Exception.class)
     public RestResponse modify(MaintenanceRecordRequest request) {
         MaintenanceRecord record = detail(request.getId());
         if (Objects.isNull(record))
@@ -166,6 +176,15 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         if (!result){
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
+        MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
+        if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.COMPLETE.getCode()));
+        //修改保养计划为完成
+        boolean planResult = maintenancePlanService.updateById(plan);
+        if (!planResult){
+            rollback();
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
         List<MtRecordImg> imageList = new ArrayList<>();
         //更新保养图片
         request.getRecordImageList().forEach(entry -> {

lift-common/src/main/java/cn.com.ty.lift.common/constants/CommonEnum.java

@@ -318,6 +318,7 @@ public class CommonEnum {
     public enum MaintenancePlanStatus implements IEnum {
 
         WAITING_MAINTENANCE("待完成","0"),
+        MAINTENANCE_DOING("保养中", "2"),
         COMPLETE("已完成", "1"),
         OVERDUE("超期", "-1");