3.22
This commit is contained in:
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.AfterSaleSituationMapper">
|
||||
|
||||
<resultMap id="afterSaleSituationMap" type="digital.laboratory.platform.reagent.entity.AfterSaleSituation">
|
||||
<id property="afterSaleSituationId" column="after_sale_situation_id"/>
|
||||
<result property="evaluationFormId" column="evaluation_form_id"/>
|
||||
<result property="supplierBusinessLicense" column="supplier_business_license"/>
|
||||
<result property="supplierPassesQualityAssuranceSystem" column="supplier_passes_quality_assurance_system"/>
|
||||
<result property="supplierProductCertification" column="supplier_product_certification"/>
|
||||
|
||||
</resultMap>
|
||||
</mapper>
|
||||
@@ -49,15 +49,15 @@
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id = ef.primary_user_id)
|
||||
, AS primary_user_name
|
||||
AS primary_user_name,
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id = ef.secondary_user_id)
|
||||
, AS primary_user_name
|
||||
AS secondary_user_name,
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id = ef.three_level_user_id)
|
||||
, AS primary_user_name
|
||||
AS three_level_user_name
|
||||
FROM evaluation_form ef
|
||||
WHERE ef.evaluation_form_id = #{evaluationFormId}
|
||||
</select>
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.EvaluationResultMapper">
|
||||
|
||||
<resultMap id="evaluationResultMap" type="digital.laboratory.platform.reagent.entity.EvaluationResult">
|
||||
<id property="evaluationResultId" column="evaluation_result_id"/>
|
||||
<result property="checkAndCalibrateEfficiencyOfSupplies" column="check_and_calibrate_efficiency_of_supplies"/>
|
||||
<result property="overallSupplierServiceSatisfaction" column="overall_supplier_service_satisfaction"/>
|
||||
<result property="evaluationFormId" column="evaluation_form_id"/>
|
||||
<result property="supplierAttitude" column="supplier_attitude"/>
|
||||
<result property="supplierEquipmentAndFacilities" column="supplier_equipment_and_facilities"/>
|
||||
<result property="supplierTechnologyAndManagementCapability" column="supplier_technology_and_management_capability"/>
|
||||
<result property="whetherTheSupplierDeliversOnTime" column="whether_the_supplier_delivers_on_time"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
|
||||
</resultMap>
|
||||
</mapper>
|
||||
@@ -25,6 +25,6 @@
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = ps.reagent_consumable_id) AS reagent_consumable_name
|
||||
FROM provide_services_or_supplies ps
|
||||
WHERE ps.provide_services_or_suppliesID = #{provideServicesOrSuppliesId}
|
||||
WHERE ps.provide_services_or_supplies_id = #{provideServicesOrSuppliesId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -4,24 +4,46 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.SignedBatchListMapper">
|
||||
|
||||
<resultMap id="signedBatchListMap" type="digital.laboratory.platform.reagent.entity.SignedBatchList">
|
||||
<id property="signedBatchListId" column="signed_batch_list_id"/>
|
||||
<result property="batch" column="batch"/>
|
||||
<result property="batchnumber" column="batchnumber"/>
|
||||
<result property="dateOfProduction" column="date_of_production"/>
|
||||
<result property="dateOfPurchase" column="date_of_purchase"/>
|
||||
<result property="dateOfReceipt" column="date_of_receipt"/>
|
||||
<result property="expirationDate" column="expiration_date"/>
|
||||
<result property="quantity" column="quantity"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="signatoryId" column="signatory_id"/>
|
||||
<result property="signingRecordFormId" column="signing_record_form_id"/>
|
||||
<result property="supplierId" column="supplier_id"/>
|
||||
<result property="warningvalue" column="warningvalue"/>
|
||||
<resultMap id="signedBatchListMap" type="digital.laboratory.platform.reagent.entity.SignedBatchList">
|
||||
<id property="signedBatchListId" column="signed_batch_list_id"/>
|
||||
<result property="batch" column="batch"/>
|
||||
<result property="batchNumber" column="batch_number"/>
|
||||
<result property="dateOfProduction" column="date_of_production"/>
|
||||
<result property="dateOfPurchase" column="date_of_purchase"/>
|
||||
<result property="dateOfReceipt" column="date_of_receipt"/>
|
||||
<result property="expirationDate" column="expiration_date"/>
|
||||
<result property="quantity" column="quantity"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="signedContentId" column="signed_content_id"/>
|
||||
<result property="supplierId" column="supplier_id"/>
|
||||
<result property="warningValue" column="warning_value"/>
|
||||
<result property="signatoryId" column="signatory_id"/>
|
||||
|
||||
</resultMap>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="signedBatchListVO" type="digital.laboratory.platform.reagent.vo.SignedBatchListVO"
|
||||
extends="signedBatchListMap">
|
||||
<result property="supplierName" column="supplier_name"></result>
|
||||
<result property="signatoryName" column="signatory_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<select id="getSignedBatchListVOList" resultMap="signedBatchListVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.SignedBatchListVO">
|
||||
SELECT sbl.*,
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id = sbl.signatory_id)
|
||||
as signatory_name,
|
||||
(
|
||||
select si.supplier_name
|
||||
from supplier_information si
|
||||
where si.supplier_information_id =sbl.supplier_id)
|
||||
as supplier_name
|
||||
FROM signed_batch_list sbl
|
||||
WHERE sbl.signed_content_id = #{signedContentId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -7,13 +7,49 @@
|
||||
<resultMap id="signingRecordFormMap" type="digital.laboratory.platform.reagent.entity.SigningRecordForm">
|
||||
<id property="signingRecordFormId" column="signing_record_form_id"/>
|
||||
<result property="purchaseListId" column="purchase_list_id"/>
|
||||
<result property="signatory" column="signatory"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="totalQuantity" column="total_quantity"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="purchaseNumber" column="purchase_number"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
<!-- <resultMap id="signingRecordFormVO" type="digital.laboratory.platform.reagent.vo.SigningRecordFormVO" extends="signingRecordFormMap">-->
|
||||
<!-- <result property="reagentConsumableName" column="reagent_consumable_name"></result>-->
|
||||
<!-- </resultMap>-->
|
||||
|
||||
<!-- <sql id="getSigningRecordFormVOSQL">-->
|
||||
<!-- SELECT srf.*,-->
|
||||
<!-- (select rc.name-->
|
||||
<!-- from reagent_consumables rc-->
|
||||
<!-- where rc.reagent_consumable_id = srf.reagent_consumable_id)-->
|
||||
<!-- , AS reagent_consumable_name-->
|
||||
<!-- FROM signing_record_form srf-->
|
||||
<!-- </sql>-->
|
||||
|
||||
<!-- <select id=" getSigningRecordFormVO" resultMap="signingRecordFormVO" resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
|
||||
<!-- SELECT srf.*,-->
|
||||
<!-- (select rc.name-->
|
||||
<!-- from reagent_consumables rc-->
|
||||
<!-- where rc.reagent_consumable_id = srf.reagent_consumable_id)-->
|
||||
<!-- , AS reagent_consumable_name-->
|
||||
<!-- FROM signing_record_form srf-->
|
||||
<!-- WHERE signing_record_form_id = #{signingRecordFormId}-->
|
||||
<!-- </select>-->
|
||||
|
||||
<!-- <!– 根据条件取 signingRecordFormVO 列表分页 –>-->
|
||||
<!-- <select id="getSigningRecordFormVOPage" resultMap="signingRecordFormVO"-->
|
||||
<!-- resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
|
||||
<!-- <include refid="getSigningRecordFormVOSQL"/>-->
|
||||
<!-- ${ew.customSqlSegment}-->
|
||||
<!-- </select>-->
|
||||
|
||||
<!-- <!– 根据条件取 signingRecordFormVO 列表 –>-->
|
||||
<!-- <select id="getSigningRecordFormVOPList" resultMap="signingRecordFormVO"-->
|
||||
<!-- resultType="digital.laboratory.platform.reagent.vo.SigningRecordFormVO">-->
|
||||
<!-- <include refid="getSigningRecordFormVOSQL"/>-->
|
||||
<!-- ${ew.customSqlSegment}-->
|
||||
<!-- </select>-->
|
||||
</mapper>
|
||||
|
||||
@@ -4,21 +4,61 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.StorageRegistrationFormMapper">
|
||||
|
||||
<resultMap id="storageRegistrationFormMap" type="digital.laboratory.platform.reagent.entity.StorageRegistrationForm">
|
||||
<id property="storageRegistrationFormId" column="storage_registration_form_id"/>
|
||||
<result property="dateOfArrival" column="date_of_arrival"/>
|
||||
<result property="depositorId" column="depositor_id"/>
|
||||
<result property="quantity" column="quantity"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="reagentConsumableNumber" column="reagent_consumable_number"/>
|
||||
<result property="reagentConsumableType" column="reagent_consumable_type"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="storageLife" column="storage_life"/>
|
||||
<resultMap id="storageRegistrationFormMap"
|
||||
type="digital.laboratory.platform.reagent.entity.StorageRegistrationForm">
|
||||
<id property="storageRegistrationFormId" column="storage_registration_form_id"/>
|
||||
<result property="dateOfArrival" column="date_of_arrival"/>
|
||||
<result property="depositorId" column="depositor_id"/>
|
||||
<result property="quantity" column="quantity"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="reagentConsumableNumber" column="reagent_consumable_number"/>
|
||||
<result property="reagentConsumableType" column="reagent_consumable_type"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="storageLife" column="storage_life"/>
|
||||
<result property="latticeId" column="lattice_id"/>
|
||||
<result property="signedBatchListId" column="signed_batch_list_id"/>
|
||||
</resultMap>
|
||||
|
||||
<result property="signedBatchListId" column="signed_batch_list_id"/>
|
||||
</resultMap>
|
||||
<resultMap id="storageRegistrationFormVO" type="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO"
|
||||
extends="storageRegistrationFormMap">
|
||||
<result property="depositorName" column="depositor_name"></result>
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
|
||||
<result property="location" column="location"></result>
|
||||
<result property="storageRoomName" column="storage_room_name"></result>
|
||||
<result property="cabinetName" column="cabinet_name"></result>
|
||||
<result property="latticeNumber" column="lattice_number"></result>
|
||||
</resultMap>
|
||||
|
||||
<select id="getStorageRegistrationFormVOList" resultMap="storageRegistrationFormVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO">
|
||||
SELECT srf.*,
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id = srf.depositor_id) as depositor_name
|
||||
, (
|
||||
select rc.name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = srf.reagent_consumable_id) as reagent_consumable_name,
|
||||
FROM storage_registration_form srf
|
||||
|
||||
</select>
|
||||
|
||||
<select id="getStorageRegistrationFormVO" resultMap="storageRegistrationFormVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO">
|
||||
SELECT srf.*,
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id = srf.depositor_id) as depositor_name
|
||||
, (
|
||||
select rc.name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = srf.reagent_consumable_id) as reagent_consumable_name,
|
||||
FROM storage_registration_form srf
|
||||
WHERE srf.storage_registration_form_id = #{storageRegistrationFormId}
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user