测试bug优化

王富生
1 parent 09bad8be
Showing 4 changed files with 16 additions and 9 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanCommitPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanCommitMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanCommitServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanCommitMapper.xml
@@ -3,6 +3,8 @@ package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo;
 import lombok.*;
 import java.time.LocalDate;
+import java.util.List;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.zteits.urbanops.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -35,9 +37,12 @@ public class InspectionPlanCommitPageReqVO extends PageParam {
     @Schema(description = "部门ID(道路负责部门id)", example = "2714")
     private Long deptId;
-    @Schema(description = "道路ID", example = "12917")
+    @Schema(description = "道路", example = "12917")
     private String roadName;
+    @Schema(description = "角色名称", example = "12917")
+    private String roleName;
+
     @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级",  example = "10")
     private Integer levelId;
@@ -56,4 +61,6 @@ public class InspectionPlanCommitPageReqVO extends PageParam {
     @Schema(description = "备注", example = "你猜")
     private String remark;
+
+    private List<String> busiLineList;
 }
 \ No newline at end of file
@@ -22,7 +22,7 @@ public interface InspectionPlanCommitMapper extends BaseMapperX&lt;InspectionPlanCo
      * @param reqDTO 查询条件
      * @return 分页结果
      */
-    IPage<InspectionPlanCommitRespVO> selectForPage(IPage<InspectionPlanCommitRespVO> page, @Param("req") InspectionPlanCommitPageReqVO reqDTO, @Param("busiLineList") List<String> busiLineList);
+    IPage<InspectionPlanCommitRespVO> selectForPage(@Param("page") IPage<InspectionPlanCommitRespVO> page, @Param("req") InspectionPlanCommitPageReqVO reqDTO);
 }
 \ No newline at end of file
@@ -87,9 +87,10 @@ public class InspectionPlanCommitServiceImpl implements InspectionPlanCommitServ
                 busiLineList.addAll(Arrays.asList(busiLine.split(",")));
             }
         }
+        pageReqVO.setBusiLineList(busiLineList);
         //分页
         IPage<InspectionPlanCommitRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
-        IPage<InspectionPlanCommitRespVO> page = inspectionPlanCommitMapper.selectForPage(mpPage, pageReqVO, busiLineList);
+        IPage<InspectionPlanCommitRespVO> page = inspectionPlanCommitMapper.selectForPage(mpPage, pageReqVO);
         // 转换返回
         return new PageResult<>(imgProcess(page.getRecords()), page.getTotal());
     }
@@ -9,7 +9,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
     <!-- 复杂联表分页查询 -->
-    <select id="selectForPage" resultType="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO">
+    <select id="selectForPage"  resultType="com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanCommitRespVO">
         SELECT
             a.plan_no,
             b.plan_name,
@@ -44,9 +44,9 @@
         <if test="req.planName != null and req.planName !=''">
             AND b.plan_name  LIKE CONCAT(#{req.planName},'%')
         </if>
-        <if test="busiLineList != null and busiLineList.size() > 0">
+        <if test="req.busiLineList != null and req.busiLineList.size() > 0">
             AND a.busi_line IN
-            <foreach collection="busiLineList" item="id" open="(" separator="," close=")">
+            <foreach collection="req.busiLineList" item="id" open="(" separator="," close=")">
                 #{id}
             </foreach>
         </if>
@@ -64,9 +64,8 @@
             AND b.road_name  LIKE CONCAT(#{req.roadName},'%')
         </if>
         <if test="req.roleName != null and req.roleName !=''">
-            AND a.role_name  LIKE CONCAT(#{req.roleName},'%')
+            AND a.role_name LIKE CONCAT(#{roleName},'%')
         </if>
-
         <if test="req.companyId != null">
             and b.company_id = #{req.companyId}
         </if>
@@ -77,7 +76,7 @@
             AND a.user_name  LIKE CONCAT('%', #{req.userName},'%')
         </if>
         <if test="req.transState != null">
-            and a.inspection_state = #{req.transState}
+            and a.trans_state = #{req.transState}
         </if>
         <if test="req.finishTime != null">
             AND DATE_FORMAT(a.finish_time, '%Y-%m-%d') = #{req.finishTime}