Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

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

@@ -52,4 +52,9 @@ public class PropertyMaintenanceController {
     public RestResponse<?> project(@RequestBody PropertyVo propertyVo) {
         return propertyService.queryJoinProjectList(propertyVo);
     }
+
+    @PostMapping("repair")
+    public RestResponse<?> repair(@RequestBody PropertyVo propertyVo) {
+        return propertyService.queryRepairList(propertyVo);
+    }
 }

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

@@ -0,0 +1,38 @@
+package cn.com.ty.lift.business.maintenance.dao.entity.model.response;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class RepairResponse {
+    private Long repairId;
+    private String projectName;
+    /**
+     * 是否紧急 0否 1是
+     */
+    private Integer isCritical;
+    /**
+     * 急修原因 0其它 1停电 2故障
+     */
+    private Integer repairReason;
+    /**
+     * 保修来源 1物业 2维保 3物联
+     */
+    private Integer source;
+    /**
+     * 报修时间
+     */
+    private LocalDateTime callerDate;
+    private String registrationCode;
+    /**
+     * 电梯类型 1直梯 2扶梯
+     */
+    private Integer liftType;
+    /**
+     * 电梯类别(1:曳引梯;2:液压梯;3:杂物梯;4:自动扶梯;5:自动人行道)
+     */
+    private Integer category;
+    private String devicePosition;
+    private String workerName;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/PropertyMaintenanceMapper.java

@@ -1,10 +1,7 @@
 package cn.com.ty.lift.business.maintenance.dao.mapper;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.model.dto.MaintenancePlanMonthTaskNum;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.DynamicMessageResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.PropertyEvaluateAuthResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.PropertyMtResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.PropertyProjectListResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.*;
 import cn.com.ty.lift.common.constants.SqlConstants;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Select;
@@ -32,5 +29,8 @@ public interface PropertyMaintenanceMapper {
     List<PropertyProjectListResponse> queryJoinProjectList(Long userId);
 
     @Select(SqlConstants.QUERY_EVALUATE_AUTH)
-    List<PropertyEvaluateAuthResponse> queryEvaluateAuth(String table,Long userId);
+    List<PropertyEvaluateAuthResponse> queryEvaluateAuth(String table, Long userId);
+
+    @Select(SqlConstants.QUERY_REPAIR_LIST)
+    List<RepairResponse> queryRepairList(Long userId);
 }

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

@@ -175,4 +175,14 @@ public class PropertyService {
         }
         return RestResponse.success(propertyMaintenanceMapper.queryEvaluateAuth(table, propertyVo.getUserId()));
     }
+
+    /**
+     * 根据用户id查询用户加入的项目的急修列表
+     *
+     * @param propertyVo userId
+     * @return 急修列表
+     */
+    public RestResponse<?> queryRepairList(PropertyVo propertyVo) {
+        return RestResponse.success(propertyMaintenanceMapper.queryRepairList(propertyVo.getUserId()));
+    }
 }

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

@@ -112,4 +112,25 @@ public interface SqlConstants {
                     "         left join project_user pu on pu.project_id = temp.project_id" +
                     "   where user_role in (21, 22)" +
                     "  and user_id =#{userId}";
+
+    //查询用户加入的项目的急修列表
+    String QUERY_REPAIR_LIST =
+            "select         er.id               repairId," +
+                    "       p.project_name      projectName," +
+                    "       er.is_critical      isCritical," +
+                    "       er.repair_reason    repairReason," +
+                    "       er.source           source," +
+                    "       er.caller_date      callerDate," +
+                    "       l.registration_code registrationCode," +
+                    "       l.lift_type         liftType," +
+                    "       l.category          category," +
+                    "       l.device_position   devicePosition," +
+                    "       ui.name             workerName" +
+                    "   from emergency_repair er" +
+                    "         left join project_user pu on er.project_id = pu.project_id" +
+                    "         left join project p on er.project_id = p.id" +
+                    "         left join lift l on er.lift_id = l.id" +
+                    "         left join project_lift_relevance plr on er.lift_id = plr.lift_id" +
+                    "         left join user_info ui on plr.worker_id = ui.user_id" +
+                    "   where pu.user_id = #{userId}";
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/service/impl/PropertyCompanyServiceImpl.java

@@ -58,9 +58,6 @@ public class PropertyCompanyServiceImpl extends ServiceImpl<PropertyCompanyMappe
                 propertyCompany.setMailingAddress("未设置地址");
             }
         });
-        if (records.getRecords().isEmpty()) {
-            return RestResponse.success();
-        }
         return RestResponse.success(records);
     }
 

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/controller/MaintenanceOptionController.java

@@ -45,7 +45,7 @@ public class MaintenanceOptionController {
                         .in("mt_company_id", 10086L, req.getMtCompanyId())
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftCategory() != null, "lift_category", req.getLiftCategory())
-                        .eq(req.getStatus() != null, "status", req.getStatus())
+                        .eq( "status",2)
                         .orderByAsc("id"));
         if (page.getRecords().isEmpty()) {
             return RestResponse.success();
@@ -76,7 +76,7 @@ public class MaintenanceOptionController {
                         .in("mt_company_id", 10086L, req.getMtCompanyId())
                         .in(req.getType() != null, "type", type(req))
                         .eq(req.getLiftCategory() != null, "lift_category", req.getLiftCategory())
-                        .eq(req.getStatus() != null, "status", req.getStatus())
+                        .eq("status", 2)
                         .in(sort != null, "sort", sort));
         if (options.isEmpty()) {
             return RestResponse.success();

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/organization/service/OrganizationService.java

@@ -23,7 +23,7 @@ public class OrganizationService {
      * @param project 项目id
      * @return RestResponse 项目相关人员
      */
-    public RestResponse users(Project project) {
+    public RestResponse<?> users(Project project) {
         List<HashMap<String, Object>> projectUsers = projectService.getBaseMapper().users(project.getId());
         if (projectUsers.isEmpty()) {
             return RestResponse.success();
@@ -63,7 +63,7 @@ public class OrganizationService {
      * @return 省，市，区，项目列表
      * @since 2019/12/17 10:05
      */
-    public RestResponse organizationTree(Long mtCompanyId) {
+    public RestResponse<?> organizationTree(Long mtCompanyId) {
         List<Organization> ps = new ArrayList<>();
         List<Organization> cs = new ArrayList<>();
         List<Organization> ds = new ArrayList<>();
@@ -167,6 +167,17 @@ public class OrganizationService {
         }
 
         for (Organization c : cs) {
+            //防止空指针 ---
+            List<Organization> organizations = c.getOrganizations();
+            if (organizations == null || organizations.get(0) == null) {
+                continue;
+            }
+            List<Project> projectsList = organizations.get(0).getProjects();
+            if (projectsList == null || projectsList.get(0) == null) {
+                continue;
+            }
+            //防止空指针 ---
+
             //获取省名
             String province = c.getOrganizations().get(0).getProjects().get(0).getProvince();
             for (Organization p : ps) {
@@ -181,6 +192,6 @@ public class OrganizationService {
         if (ps.isEmpty()) {
             return RestResponse.success();
         }
-        return RestResponse.success(ps, "成功");
+        return RestResponse.success(ps);
     }
 }