Преглед изворни кода

更换维保负责人返回项目id和电梯id

别傲 пре 5 година
родитељ
комит
b245568a05

+ 17 - 2
lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/response/ProjectRelevanceResponse.java

@@ -10,13 +10,28 @@ import lombok.Data;
 @Data
 public class ProjectRelevanceResponse {
     /**
-     * 主键id
+     * 项目关联ID
      */
     private Long id;
     /**
-     * 维保工id
+     * 维保工ID
      */
     private Long workerId;
+
+    /**
+     * 项目ID
+     */
+    private Long projectId;
+
+    /**
+     * 电梯ID
+     */
+    private Long liftId;
+
+    /**
+     * 公司电梯关联ID
+     */
+    private Long relevanceId;
     /**
      * 项目编号
      */

+ 5 - 0
lift-business-service/src/main/resources/mapper/project/ProjectLiftRelevanceMapper.xml

@@ -30,14 +30,19 @@
 		SELECT
 		   plr.id              AS id,
 		   plr.worker_id       AS workerId,
+		   p.id                AS projectId,
 		   p.project_code      AS projectCode,
   		   p.project_name      AS projectName,
+		   pclr.id             AS relevanceId,
+		   l.id                AS liftId,
            l.lift_code         AS liftCode,
            l.registration_code AS registrationCode,
            l.device_position   AS devicePosition
 		FROM project_lift_relevance plr
 		  LEFT JOIN project p ON plr.project_id = p.id
 		  LEFT JOIN lift l ON plr.lift_id = l.id
+		  LEFT JOIN platform_company_lift_relevance pclr
+					ON l.id = pclr.lift_id AND plr.mt_company_id = pclr.mt_company_id
 		WHERE plr.worker_id = #{request.workerId,jdbcType=BIGINT}
 	</select>