Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 b0b8ca4b383c5c3a2373200ca1872c20ee9ff999

Merge remote-tracking branch 'origin/master'

 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"

 user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java

@@ -77,7 +77,7 @@
            ));
        });
        if(roleMenuList.size()<1){
            roleMenuList.add(new RoleMenu(null,nextId,39L,false,false,false,false,createTime));
            roleMenuList.add(new RoleMenu(null,nextId,39L,true,false,false,false,createTime));
        }
        //roleMenuAddList.forEach(System.out::println);
        int i = roleManageMapper.insertBatchRoleMenu(roleMenuList);

 user-server/src/main/resources/mapper/MenuMapper.xml

@@ -7,7 +7,7 @@
        from menu
        where state = 1
          and id != 39
       and parent_id != 39
        and parent_id != 39
    </select>
    <select id="getMenuNameAndId" resultType="map">
        select url, id, name