Merge branches 'develop' and 'huangyuan-user' 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/project/dao/mapper/ProjectLiftRelevanceMapper.java

@@ -17,4 +17,6 @@ public interface ProjectLiftRelevanceMapper extends BaseMapper<ProjectLiftReleva
     IPage<ProjectRelevanceResponse> selectListByUserId(IPage<ProjectRelevanceResponse> page, @Param("request") ProjectRequest request);
 
     int count(@Param("mtCompanyId") Long mtCompanyId, @Param("projectStatus") Integer projectStatus);
+
+    int countLiftNum(@Param("mtCompanyId") Long mtCompanyId, @Param("projectId") Long projectId);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -104,12 +104,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @date 2020/5/20 9:54 上午
      */
     public int countLiftNum(Long mtCompanyId, Long projectId) {
-        QueryWrapper<ProjectLiftRelevance> queryWrapper = new QueryWrapper<>();
-        LambdaQueryWrapper<ProjectLiftRelevance> lambdaQueryWrapper = queryWrapper.lambda();
-        lambdaQueryWrapper.eq(ProjectLiftRelevance::getMtCompanyId, mtCompanyId);
-        lambdaQueryWrapper.ne(ProjectLiftRelevance::getProjectId, projectId);
-        lambdaQueryWrapper.eq(ProjectLiftRelevance::getDeleteFlag, 0);
-        return count(lambdaQueryWrapper);
+        return baseMapper.countLiftNum(mtCompanyId, projectId);
     }
 
     /**

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

@@ -53,4 +53,16 @@
 		WHERE plr.mt_company_id = #{mtCompanyId}
 		  AND p.project_status = #{projectStatus}
 	</select>
+
+	<select id="countLiftNum" resultType="java.lang.Integer">
+		SELECT count(1)
+		FROM project_lift_relevance plr
+				 LEFT JOIN platform_company_lift_relevance pclr
+						   ON pclr.lift_id = plr.lift_id AND plr.mt_company_id = pclr.mt_company_id
+		WHERE plr.mt_company_id = #{mtCompanyId}
+		  AND plr.project_id =  #{projectId}
+		  AND plr.delete_flag = 0
+		  AND pclr.lift_company_status != '1'
+		  AND pclr.delete_flag = 0
+	</select>
 </mapper>