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

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/MaintenanceAppResponse.java

@@ -55,6 +55,14 @@ public class MaintenanceAppResponse {
      * 电梯类型
      */
     private Integer liftType;
+    /**
+     * 电梯类别
+     */
+    private Integer category;
+    /**
+     * 电梯位置
+     */
+    private String devicePosition;
     /**
      * 维保工
      */

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

@@ -18,6 +18,8 @@ import cn.com.ty.lift.common.utils.MapHelper;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -81,6 +83,20 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         return (result * 1000) > expected;
     }
 
+    /**
+     * @param planId 计划id
+     * @param mtCompanyId 公司id
+     * @return 是否存在
+     * @description 根据计划id和公司id查询是否有保养记录
+     * @date 2020/1/20 2:41 下午
+     */
+    public boolean count(Long planId, Long mtCompanyId) {
+        LambdaQueryWrapper<MaintenanceRecord> lambdaQueryWrapper = new QueryWrapper<MaintenanceRecord>().lambda();
+        lambdaQueryWrapper.eq(MaintenanceRecord::getMtPlanId, planId);
+        lambdaQueryWrapper.eq(MaintenanceRecord::getMtCompanyId, mtCompanyId);
+        return count(lambdaQueryWrapper) > 0;
+    }
+
     /**
      * @param request 保养单信息
      * @return 是否成功
@@ -89,6 +105,10 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      */
     public RestResponse saveRecord(MaintenanceAddRecordRequest request) {
         MaintenanceRecord record = request.getRecord();
+        Long planId = record.getMtPlanId();
+        Long mtCompanyId = record.getMtCompanyId();
+        boolean count = count(planId,mtCompanyId);
+        if (count) return  RestResponse.fail(MessageUtils.get("msg.exist.record"));
         boolean result = calc(record.getLiftId(), request.getCoordinate());
         if (result) return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
         Long liftId = record.getLiftId();

lift-business-service/src/main/resources/locale/response.properties

@@ -23,4 +23,5 @@ msg.company.lift.empty=\u8BE5\u516C\u53F8\u4E0B\u6682\u65F6\u6CA1\u6709\u7535\u6
 msg.error.time=\u9996\u4FDD\u65F6\u95F4\u5E94\u5728\u9879\u76EE\u5F00\u59CB\u65F6\u95F4\u548C\u7ED3\u675F\u65F6\u95F4\u8303\u56F4\u5185
 msg.error.lift.status=\u8BE5\u7535\u68AF\u5DF2\u5F03\u7528
 msg.error.person.scope=\u4EBA\u5458\u4E0D\u5728\u7535\u68AF\u9644\u8FD1\uFF0C\u65E0\u6CD5\u5F00\u59CB\u4FDD\u517B
-msg.project.operate.success=\u670D\u52A1\u64CD\u4F5C\u6210\u529F
+msg.project.operate.success=\u670D\u52A1\u64CD\u4F5C\u6210\u529F
+msg.exist.record=\u8BE5\u4FDD\u517B\u8BB0\u5F55\u5DF2\u5B58\u5728\uFF0C\u4E0D\u80FD\u91CD\u590D\u4FDD\u517B

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -97,7 +97,9 @@
 			   l.registration_code AS registrationCode,
 			   l.use_company_code  AS useCompanyCode,
 			   l.lift_type         AS liftType,
+			   l.category          AS category,
 		       l.lift_code         AS liftCode,
+		       l.device_position   AS devicePosition,
 			   ui.name             AS workerName,
 		       mp.worker_id        AS workerId,
 			   mp.plan_date        AS planDate,