修改设备计划搜索

Fixiaobai

2023-08-30 5d2932cadaee4be576c1b650b402c74d6296e6dd

修改设备计划搜索

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java

@@ -18,8 +18,10 @@

    @ApiModelProperty(value = "当前页", example = "1", required = true)
    private Long currentPage;

    @ApiModelProperty(value = "每页多少条", example = "10", required = true)
    private Long pageSize;

    @ApiModelProperty(value = "计划单号",  required = false)
    private String plannedOrderNumber;
}

 laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml

@@ -46,7 +46,7 @@
        from metering_plan
        where 1=1
        <if test="dto.plannedOrderNumber!=null and dto.plannedOrderNumber!=''">
            and planned_order_number=#{plannedOrderNumber}
            and planned_order_number like concat('%',#{dto.plannedOrderNumber},'%')
        </if>
        LIMIT #{limitPage.start},#{limitPage.end}) p
        LEFT JOIN metrical_information i ON p.id = i.plan
@@ -56,7 +56,7 @@
    <select id="getTotal" resultType="java.util.Map">
        select count(id) num from metering_plan where 1=1
        <if test="dto.plannedOrderNumber!=null and dto.plannedOrderNumber!=''">
            and planned_order_number=#{plannedOrderNumber}
            and planned_order_number like concat('%',#{dto.plannedOrderNumber},'%')
        </if>
    </select>
    <select id="getPlanMeasureInstrument"