维保计划打印代码优化

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

@@ -3,13 +3,10 @@ package cn.com.ty.lift.business.maintenance.service;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.service.LiftService;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.*;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.LiftPrintResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanPrintResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtPlanResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.*;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.service.ProjectService;
@@ -21,7 +18,6 @@ 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.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -390,17 +386,10 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         //根据电梯id列表查询电梯列表
         List<LiftPrintResponse> liftList = liftService.queryLiftListByIdList(liftIdList);
 
-        //拼接查询维保计划的条件
-        List<String> projectLiftList = new ArrayList<>();
-        for (MaintenancePlan entry : request.getLiftList()) {
-            String builder = entry.getProjectId() + "-" + entry.getLiftId();
-            projectLiftList.add(builder);
-        }
-
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("mtCompanyId", request.getMtCompanyId());
-        paramMap.put("projectLiftList", projectLiftList);
-        //根据电梯id、项目id、公司id查询维保计划列表
+        paramMap.put("liftIdList", liftIdList);
+        //根据电梯id、公司id查询维保计划列表
         List<MaintenancePlan> planList = baseMapper.queryPlanListByIds(paramMap);
 
         //组装电梯列表中的维保计划数据

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

@@ -91,12 +91,11 @@
 	</select>
 
 	<select id="queryPlanListByIds" parameterType="java.util.Map" resultMap="BaseResultMap">
-		SELECT t.*
-		FROM (SELECT *, concat(project_id,'-',lift_id) AS projectLift
-			  FROM maintenance_plan) t
-		WHERE t.mt_company_id = #{paramMap.mtCompanyId,jdbcType=VARCHAR}
-		  AND t.projectLift IN
-		<foreach collection="paramMap.projectLiftList" item="id" index="index" open="(" close=")" separator=",">
+        SELECT <include refid="Base_Column_List"/>
+			  FROM maintenance_plan
+		WHERE mt_company_id = #{paramMap.mtCompanyId,jdbcType=VARCHAR}
+		  AND lift_id IN
+		<foreach collection="paramMap.liftIdList" item="id" index="index" open="(" close=")" separator=",">
 			#{id}
 		</foreach>
 	</select>