修改bug

Fixiaobai

2023-09-07 e29f147aab5b0b0b794d611b522b67b94423e3cf

 inspection-server/src/main/resources/mapper/PlanMapper.xml

@@ -4,14 +4,11 @@
    <resultMap id="selectAllPlanMap" type="map">
        <id property="code" column="code"/>
        <result property="id" column="id"/>
        <result property="inspectionStatus" column="inspectionStatus"/>
        <result property="samplename" column="samplename"/>
        <result property="testState" column="inspectionStatus"/>
        <result property="startTime" column="startTime"/>
        <result property="endTime" column="endTime"/>
        <collection property="father" resultMap="selectAllPlanMapTowMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllPlanMapTowMap" type="map">
        <id property="samplename" column="samplename"/>
        <collection property="chldren" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
        <collection property="children" resultMap="selectAllPlanMapTowsMap" javaType="List"/>
    </resultMap>
    <resultMap id="selectAllPlanMapTowsMap" type="map">
        <id property="pid" column="pid"/>
@@ -19,9 +16,13 @@
        <result property="unit" column="unit"/>
        <result property="required" column="required"/>
        <result property="internal" column="internal"/>
        <result property="testValue" column="testValue"/>
        <result property="testState" column="testState"/>
        <result property="uId" column="uId"/>
        <result property="checker" column="checker"/>
        <result property="isuId" column="isuId"/>
        <result property="instrumentname" column="instrumentname"/>
        <result property="classId" column="classId"/>
    </resultMap>
    <!--查询检验计划-->
    <select id="selectAllPlan" resultMap="selectAllPlanMap">
@@ -36,8 +37,12 @@
        ip.unit,
        required,
        internal,
        test_value testValue,
        test_state testState,
        u.id uId,
        u.name checker,
        isu.id isuId,
        isu.classify_id classId,
        equipment_name instrumentname
        from lims_laboratory.inspection_product ip
        left join lims_laboratory.inspection_material im on ip.inspection_material_id = im.id
@@ -54,6 +59,9 @@
            <if test="beginTime != null and endTime != null">
                and i.start_time between #{beginTime} and #{endTime}
            </if>
            <if test="isLookMe != false and id != null">
                and ip.user_id=#{id}
            </if>
        </where>
    </select>
</mapper>