4.25

src/main/resources/mapper/WarehousingContentMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="digital.laboratory.platform.reagent.mapper.WarehousingContentMapper">
 
     <resultMap id="warehousingContentMap" type="digital.laboratory.platform.reagent.entity.WarehousingContent">
-        <id property="warehousingContentId" column="warehousing_content_id"></id>
+        <id property="id" column="id"></id>
         <result property="reagentConsumableId" column="reagent_consumable_id"></result>
         <result property="totalQuantity" column="total_quantity"></result>
         <result property="warehousingRecordFormId" column="warehousing_record_form_id"></result>
@@ -16,17 +16,22 @@
         <result property="createBy" column="create_by"/>
         <result property="updateBy" column="update_by"/>
         <result property="acceptanceRecordFormId" column="acceptance_record_form_id"/>
+        <result property="supplierId" column="supplier_id"/>
+
     </resultMap>
 
     <resultMap id="warehousingContentVO" type="digital.laboratory.platform.reagent.vo.WarehousingContentVO" extends="warehousingContentMap">
         <result property="reagentConsumableName" column="reagent_consumable_name"></result>
+        <result property="supplierName" column="supplier_name"/>
+        <result property="applicantName" column="applicant_name"/>
+
     </resultMap>
 
     <select id="getWarehousingContentVOList" resultMap="warehousingContentVO" resultType="digital.laboratory.platform.reagent.vo.WarehousingContentVO">
         SELECT wc.*,
-               (select rc.reagent_consumable_name
-                from reagent_consumables rc
-                where rc.reagent_consumable_id = wc.reagent_consumable_id) as reagent_consumable_name
+               (select rc.reagent_consumable_name from reagent_consumables rc where rc.reagent_consumable_id = wc.reagent_consumable_id) as reagent_consumable_name ,
+               (select si.supplier_name from supplier_information si where si.id = #{supplierId}) as supplier_name ,
+               (select user.name from dlp_base.sys_user user where user.user_id=wc.create_by ) as applicant_name
         FROM warehousing_content wc
         WHERE wc.warehousing_record_form_id = #{warehousingRecordFormId}
     </select>