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

lift-business-service/src/main/java/cn/com/ty/lift/business/common/Judge.java

@@ -123,8 +123,8 @@ public interface Judge {
      */
     static RestResponse result(Object object){
         if(object instanceof Boolean){
-            return (Boolean)object ? RestResponse.success(object) : RestResponse.fail();
+            return (Boolean)object ? RestResponse.success(object) : RestResponse.success();
         }
-        return ObjectUtil.isNotEmpty(object) ? RestResponse.success(object) : RestResponse.fail();
+        return ObjectUtil.isNotEmpty(object) ? RestResponse.success(object) : RestResponse.success();
     }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/common/Values.java

@@ -315,6 +315,7 @@ public interface Values {
     String erMustFinish = "急修完成后才能操作";
     String erHadEvaluate = "急修已经评价了";
     String erMissingImage = "缺少急修图片";
+    String erMissingScore = "请评价打分";
 
     //==============================================================================
 

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

@@ -413,16 +413,22 @@ public class EmergencyRepairController {
     public RestResponse evaluate(@RequestBody EvaluationRequest request){
         Long recordId = request.getRecordId();
         Judge.id(recordId);
-        String customerSign = request.getCustomerSign();
-        Judge.notNull(customerSign,Values.erMissingSign);
+        String imgUrl = request.getImgUrl();
+        Judge.notNull(imgUrl,Values.erMissingSign);
+        Integer serviceLevel = request.getServiceLevel();
+        Judge.isTrue(serviceLevel > 0,Values.erMissingScore);
+        Integer starLevel = request.getStarLevel();
+        Judge.isTrue(starLevel > 0,Values.erMissingScore);
         EmergencyRepair repair = emergencyRepairService.getById(recordId);
         Judge.notNull(repair);
         Judge.isTrue(Values.erStatusFinish(repair.getStatus()),Values.erMustFinish);
         int count = evaluationService.countByRecord(recordId);
         Judge.notTrue(count > 0,Values.erHadEvaluate);
         Evaluation evaluation = new Evaluation();
-        //复制属性到评价bean
+        //从request中复制相同属性
         BeanUtil.copyProperties(request,evaluation);
+        evaluation.setSource(2);
+        evaluation.setLiftId(repair.getLiftId());
         evaluation.setPostDate(LocalDateTime.now());
         boolean result = evaluationService.save(evaluation);
         return Judge.result(result);
@@ -475,4 +481,19 @@ public class EmergencyRepairController {
         Judge.notNull(lists);
         return Judge.result(lists);
     }
+
+    /**
+     * 电梯管理中查询急修记录
+     * @param request
+     * @return
+     */
+    @PostMapping("listRepair")
+    public RestResponse listRepair(@RequestBody RepairRequest request){
+        Long mtCompanyId = request.getMtCompanyId();
+        Long liftId = request.getLiftId();
+        Long projectId = request.getProjectId();
+        Judge.ids(liftId,mtCompanyId,projectId);
+        List<EmergencyRepair> lists = emergencyRepairService.listByCompanyLiftProject(mtCompanyId,liftId,projectId);
+        return Judge.result(lists);
+    }
 }

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

@@ -26,6 +26,11 @@ public class RepairRequest extends BaseRequestModel{
      */
     private Long mtCompanyId;
 
+    /**
+     * 电梯id
+     */
+    private Long liftId;
+
     /**
      * 区域id
      */
@@ -151,10 +156,6 @@ public class RepairRequest extends BaseRequestModel{
      * 次要急修人签名
      */
     private String secondSign;
-    /**
-     * 客户签名， 评价中添加
-     */
-    private String customerSign;
 
     /**
      * 现场描述

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

@@ -302,9 +302,4 @@ public class EmergencyRepair implements Serializable {
      */
     @TableField("second_sign")
     private String secondSign;
-    /**
-     * 客户签名， 评价中添加
-     */
-    @TableField("customer_sign")
-    private String customerSign;
 }

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

@@ -130,6 +130,14 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         return getOne(lambdaQueryWrapper);
     }
 
+    public List<EmergencyRepair> listByCompanyLiftProject(Long mtCompanyId,Long liftId,Long projectId){
+        QueryWrapper<EmergencyRepair> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<EmergencyRepair> lambdaQueryWrapper = queryWrapper.lambda();
+        lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompanyId);
+        lambdaQueryWrapper.eq(EmergencyRepair::getLiftId,liftId);
+        lambdaQueryWrapper.eq(EmergencyRepair::getProjectId, projectId);
+        return list(lambdaQueryWrapper);
+    }
     /**
      * 统计维保公司和电梯下是否存在待急修和急修中的急修单
      * @param mtCompanyId

lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/dao/entity/model/EvaluationRequest.java

@@ -15,10 +15,5 @@ public class EvaluationRequest extends Evaluation {
      * 维保公司id
      */
     private Long mtCompanyId;
-
-    /**
-     * 客户签名
-     */
-    private String customerSign;
     
 }

lift-business-service/src/main/resources/mapper/emergency/EmergencyRepairMapper.xml

@@ -45,7 +45,6 @@
 		<result column="close_reason" property="closeReason" jdbcType="VARCHAR" />
 		<result column="main_sign" property="mainSign" jdbcType="VARCHAR" />
 		<result column="second_sign" property="secondSign" jdbcType="VARCHAR" />
-		<result column="customer_sign" property="customerSign" jdbcType="VARCHAR" />
 
 		<result column="project_name" property="projectName" jdbcType="VARCHAR" />
         <result column="project_code" property="projectCode" jdbcType="VARCHAR" />

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/Judge.java

@@ -123,8 +123,8 @@ public interface Judge {
      */
     static RestResponse result(Object object){
         if(object instanceof Boolean){
-            return (Boolean)object ? RestResponse.success(object) : RestResponse.fail();
+            return (Boolean)object ? RestResponse.success(object) : RestResponse.success();
         }
-        return ObjectUtil.isNotEmpty(object) ? RestResponse.success(object) : RestResponse.fail();
+        return ObjectUtil.isNotEmpty(object) ? RestResponse.success(object) : RestResponse.success();
     }
 }