4.13
This commit is contained in:
@@ -4,30 +4,93 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.AcceptanceRecordFormMapper">
|
||||
|
||||
<resultMap id="acceptanceRecordFormMap" type="digital.laboratory.platform.reagent.entity.AcceptanceRecordForm">
|
||||
<id property="acceptanceRecordFormId" column="acceptance_record_form_id"/>
|
||||
<result property="acceptanceConclusion" column="acceptance_conclusion"/>
|
||||
<result property="auditTimeOfDepartment" column="audit_time_of_department"/>
|
||||
<result property="dateOfAcceptance" column="date_of_acceptance"/>
|
||||
<result property="auditOpinionOfDepartment" column="audit_opinion_of_department"/>
|
||||
<result property="departmentHeadId" column="department_head_id"/>
|
||||
<result property="followUpTreatment" column="follow_up_treatment"/>
|
||||
<result property="nonconformingItem" column="nonconforming_item"/>
|
||||
<result property="auditOpinionOfQuality" column="audit_opinion_of_quality"/>
|
||||
<result property="qualityManagerId" column="quality_manager_id"/>
|
||||
<result property="auditTimeOfQuality" column="audit_time_of_quality"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="auditOpinionOfManage" column="audit_opinion_of_manage"/>
|
||||
<result property="auditTimeOfManager" column="audit_time_of_manager"/>
|
||||
<result property="reagentSuppliesManagerId" column="reagent_supplies_manager_id"/>
|
||||
<result property="signedBatchListId" column="signed_batch_list_id"/>
|
||||
<resultMap id="acceptanceRecordFormMap" type="digital.laboratory.platform.reagent.entity.AcceptanceRecordForm">
|
||||
<id property="acceptanceRecordFormId" column="acceptance_record_form_id"/>
|
||||
<result property="acceptanceConclusion" column="acceptance_conclusion"/>
|
||||
<result property="auditTimeOfThreeLevel" column="audit_time_of_three_level"/>
|
||||
<result property="dateOfAcceptance" column="date_of_acceptance"/>
|
||||
<result property="auditOpinionOfThreeLevel" column="audit_opinion_of_three_level"/>
|
||||
<result property="threeLevelAuditorId" column="three_level_auditor_id"/>
|
||||
<result property="followUpTreatment" column="follow_up_treatment"/>
|
||||
<result property="nonconformingItem" column="nonconforming_item"/>
|
||||
<result property="auditOpinionOfSecondary" column="audit_opinion_of_secondary"/>
|
||||
<result property="primaryAuditorId" column="primary_auditor_id"/>
|
||||
<result property="secondaryAuditorId" column="secondary_auditor_id"/>
|
||||
<result property="auditTimeOfSecondary" column="audit_time_of_secondary"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="auditOpinionOfPrimary" column="audit_opinion_of_primary"/>
|
||||
<result property="auditTimeOfPrimary" column="audit_time_of_primary"/>
|
||||
<result property="signedBatchListId" column="signed_batch_list_id"/>
|
||||
<result property="auditResultOfPrimary" column="audit_result_of_primary"/>
|
||||
<result property="auditResultOfThreeLevel" column="audit_result_of_three_level"/>
|
||||
<result property="auditResultOfSecondary" column="audit_result_of_secondary"/>
|
||||
<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="theSameBrandAndModel" column="the_same_brand_and_model"/>
|
||||
<result property="bam_remarks" column="bam_remarks"/>
|
||||
<result property="consistentQuantity" column="consistent_quantity"/>
|
||||
<result property="cq_remarks" column="cq_remarks"/>
|
||||
<result property="packingInGoodCondition" column="packing_in_good_condition"/>
|
||||
<result property="pgc_remarks" column="pgc_remarks"/>
|
||||
<result property="validityPeriod" column="validity_period"/>
|
||||
<result property="vp_remarks" column="vp_remarks"/>
|
||||
<result property="deliveryCycle" column="delivery_cycle"/>
|
||||
<result property="dc_remarks" column="dc_remarks"/>
|
||||
<result property="supplierId" column="supplier_id"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="warehousingContentId" column="warehousing_content_id"/>
|
||||
</resultMap>
|
||||
|
||||
<result property="auditResultOfManager" column="audit_result_of_manager"/>
|
||||
<result property="auditResultOfDepartment" column="audit_result_of_department"/>
|
||||
<result property="auditResultOfQuality" column="audit_result_of_quality"/>
|
||||
<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>
|
||||
<resultMap id="acceptanceRecordFormVO" type="digital.laboratory.platform.reagent.vo.AcceptanceRecordFormVO"
|
||||
extends="acceptanceRecordFormMap">
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
|
||||
<result property="supplierName" column="supplier_name"></result>
|
||||
<result property="primaryAuditorName" column="primary_auditor_name"></result>
|
||||
<result property="secondaryAuditorName" column="secondary_auditor_name"></result>
|
||||
<result property="threeLevelAuditorName" column="three_level_auditor_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getAcceptanceRecordFormVOSQL">
|
||||
SELECT arf.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = arf.reagent_consumable_id) as reagent_consumable_name,
|
||||
(select si.supplier_name
|
||||
from supplier_information si
|
||||
where si.supplier_information_id = arf.supplier_id) as supplier_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=arf.primary_auditor_id
|
||||
) AS primary_auditor_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=arf.secondary_auditor_id
|
||||
) AS secondary_auditor_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=arf.three_level_auditor_id
|
||||
) AS three_level_auditor_name
|
||||
FROM acceptance_record_form arf
|
||||
</sql>
|
||||
|
||||
<select id="getAcceptanceRecordFormVOPage" resultMap="acceptanceRecordFormVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.AcceptanceRecordFormVO">
|
||||
<include refid="getAcceptanceRecordFormVOSQL"></include>
|
||||
|
||||
</select>
|
||||
|
||||
<select id="getAcceptanceRecordFormVO" resultMap="acceptanceRecordFormVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.AcceptanceRecordFormVO">
|
||||
SELECT arf.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = arf.reagent_consumable_id) as reagent_consumable_name,
|
||||
(select si.supplier_name
|
||||
from supplier_information si
|
||||
where si.supplier_id = arf.supplier_id)as supplier_name
|
||||
FROM acceptance_record_form arf
|
||||
WHERE arf.acceptance_record_form_id = #{acceptanceRecordFormId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -4,20 +4,53 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.ApplicationForUseMapper">
|
||||
|
||||
<resultMap id="applicationForUseMap" type="digital.laboratory.platform.reagent.entity.ApplicationForUse">
|
||||
<id property="applicationForUseId" column="application_for_use_id"/>
|
||||
<result property="dateOfCollection" column="date_of_collection"/>
|
||||
<result property="recipientId" column="recipient_id"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="use" column="use"/>
|
||||
<resultMap id="applicationForUseMap" type="digital.laboratory.platform.reagent.entity.ApplicationForUse">
|
||||
<id property="applicationForUseId" column="application_for_use_id"/>
|
||||
<result property="dateOfCollection" column="date_of_collection"/>
|
||||
<result property="recipientId" column="recipient_id"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="deliveryRegistrationFormId" column="delivery_registration_form_id"/>
|
||||
<result property="requisitionRecordId" column="requisition_record_id"/>
|
||||
<result property="claimCode" column="claim_code"/>
|
||||
<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>
|
||||
|
||||
<resultMap id="applicationForUseVO" type="digital.laboratory.platform.reagent.vo.ApplicationForUseVO"
|
||||
extends="applicationForUseMap">
|
||||
<result property="recipientName" column="recipient_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getApplicationForUseVOSQL">
|
||||
SELECT afu.*,
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id =afu.recipient_id) AS recipient_name
|
||||
FROM application_for_use afu
|
||||
</sql>
|
||||
|
||||
<select id="getApplicationForUseVOList" resultMap="applicationForUseVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.ApplicationForUseVO">
|
||||
<include refid="getApplicationForUseVOSQL"></include>
|
||||
|
||||
</select>
|
||||
|
||||
<select id="getApplicationForUseVOPage" resultMap="applicationForUseVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.ApplicationForUseVO">
|
||||
<include refid="getApplicationForUseVOSQL"></include>
|
||||
|
||||
</select>
|
||||
|
||||
<select id="getApplicationForUseVO" resultMap="applicationForUseVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.ApplicationForUseVO">
|
||||
SELECT afu.*,
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id =afu.recipient_id) AS recipient_name
|
||||
FROM application_for_use afu
|
||||
WHERE afu.application_for_use_id = #{applicationForUseId}
|
||||
</select>
|
||||
|
||||
<result property="deliveryRegistrationFormId" column="delivery_registration_form_id"/>
|
||||
<result property="requisitionRecordId" column="requisition_record_id"/>
|
||||
<result property="claimCode" column="claim_code"/>
|
||||
<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>
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
<result property="brand" column="brand"/>
|
||||
<result property="category" column="category"/>
|
||||
<result property="deviationOrUncertainty" column="deviation_or_uncertainty"/>
|
||||
<result property="number" column="number"/>
|
||||
<result property="packagedCopies" column="packaged_copies"/>
|
||||
<result property="purchaseCatalogueId" column="purchase_catalogue_id"/>
|
||||
<result property="purchaseCatalogueNumber" column="purchase_catalogue_number"/>
|
||||
@@ -18,23 +17,15 @@
|
||||
<result property="specificationAndModel" column="specification_and_model"/>
|
||||
<result property="standardValueOrPurity" column="standard_value_or_purity"/>
|
||||
<result property="unitPrice" column="unit_price"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="catalogueDetailsVO" type="digital.laboratory.platform.reagent.vo.CatalogueDetailsVO"
|
||||
extends="catalogueDetailsMap">
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"/>
|
||||
<result property="englishName" column="english_name"/>
|
||||
<result property="alias" column="alias"/>
|
||||
<result property="storageCondition" column="storage_condition"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="minimumUnit" column="minimum_unit"/>
|
||||
|
||||
</resultMap>
|
||||
<!-- 根据条件取 CatalogueDetailsVO列表 -->
|
||||
<select id="getCatalogueDetailsVOList" resultMap="catalogueDetailsVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.CatalogueDetailsVO">
|
||||
SELECT cd.*,
|
||||
(SELECT rc.name
|
||||
FROM reagent_consumables rc
|
||||
WHERE rc.reagent_consumable_id = cd.reagent_consumable_id) AS reagent_consumable_name
|
||||
FROM catalogue_details cd
|
||||
WHERE cd.purchase_catalogue_id = #{purchaseCatalogueId}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
<id property="centralizedRequestId" column="centralized_request_id"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="purchasingPlanId" column="purchasing_plan_id"/>
|
||||
<result property="auditorId" column="auditor_id"/>
|
||||
<result property="dateOfApplication" column="date_of_application"/>
|
||||
<result property="auditTime" column="audit_time"/>
|
||||
<result property="auditresult" column="audit_result"/>
|
||||
<result property="auditOpinion" column="audit_opinion"/>
|
||||
<result property="applicantId" column="applicant_id"/>
|
||||
<result property="orgName" column="org_name"/>
|
||||
<result property="applicantName" column="applicant_name"/>
|
||||
<result property="auditorId" column="auditor_id"/>
|
||||
<result property="number" column="number"/>
|
||||
<result property="orgName" column="org_name"/>
|
||||
<result property="applicantName" column="applicant_name"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
extends="centralizedRequestMap">
|
||||
<result property="orgName" column="org_name"/>
|
||||
<result property="applicantName" column="applicant_name"/>
|
||||
<result property="auditorName" column="auditor_name"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getCentralizedRequestVOSQL">
|
||||
@@ -36,11 +35,6 @@
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=cr.applicant_id
|
||||
) AS applicant_name
|
||||
, (
|
||||
SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=cr.auditor_id
|
||||
) AS auditor_name
|
||||
FROM centralized_request cr
|
||||
</sql>
|
||||
|
||||
@@ -54,11 +48,6 @@
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=cr.applicant_id
|
||||
) AS applicant_name
|
||||
, (
|
||||
SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=cr.auditor_id
|
||||
) AS auditor_name
|
||||
from centralized_request cr
|
||||
where cr.centralized_request_id =#{centralizedRequestId}
|
||||
</sql>
|
||||
|
||||
@@ -16,4 +16,17 @@
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="checkContentVO" type="digital.laboratory.platform.reagent.vo.CheckContentVO" extends="checkContentMap">
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<select id="getCheckContentVOList" resultMap="checkContentVO" resultType="digital.laboratory.platform.reagent.vo.CheckContentVO">
|
||||
SELECT cc.*,
|
||||
(select rc.name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = cc.reagent_consumable_id)
|
||||
FROM check_content cc
|
||||
WHERE cc.compliance_check_id = #{complianceCheckId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -6,24 +6,71 @@
|
||||
|
||||
<resultMap id="complianceCheckMap" type="digital.laboratory.platform.reagent.entity.ComplianceCheck">
|
||||
<id property="complianceCheckId" column="compliance_check_id"/>
|
||||
<result property="auditOpinionOfDepartment" column="audit_opinion_of_department"/>
|
||||
<result property="auditOpinionOfTechnical" column="audit_opinion_of_technical"/>
|
||||
<result property="auditResultOfDepartment" column="audit_result_of_department"/>
|
||||
<result property="auditResultOfTechnical" column="audit_result_of_technical"/>
|
||||
<result property="auditTimeOfDepartment" column="audit_time_of_department"/>
|
||||
<result property="auditTimeOfTechnical" column="audit_time_of_technical"/>
|
||||
<result property="checkForNonconformities" column="check_for_nonconformities"/>
|
||||
<result property="auditOpinionOfPrimary" column="audit_opinion_of_primary"/>
|
||||
<result property="auditOpinionOfSecondary" column="audit_opinion_of_secondary"/>
|
||||
<result property="auditResultOfPrimary" column="audit_result_of_primary"/>
|
||||
<result property="auditResultOfSecondary" column="audit_result_of_secondary"/>
|
||||
<result property="auditTimeOfPrimary" column="audit_time_of_primary"/>
|
||||
<result property="auditTimeOfSecondary" column="audit_time_of_secondary"/>
|
||||
<result property="dateOfInspection" column="date_of_inspection"/>
|
||||
<result property="examinationConclusion" column="examination_conclusion"/>
|
||||
<result property="executorId" column="executor_id"/>
|
||||
<result property="headOfDepartmentId" column="head_of_department_id"/>
|
||||
<result property="primaryAuditorId" column="primary_auditor_id"/>
|
||||
<result property="inspectionScheme" column="inspection_scheme"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="technicalDirectorId" column="technical_director_id"/>
|
||||
|
||||
<result property="secondaryAuditorId" column="secondary_auditor_id"/>
|
||||
<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="number" column="number"/>
|
||||
<result property="brand" column="brand"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="specificationAndModel" column="specification_and_model"/>
|
||||
<result property="nonconformingItem" column="nonconforming_item"/>
|
||||
<result property="reagentConsumableNumber" column="reagent_consumable_number"/>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="complianceCheckVO" type="digital.laboratory.platform.reagent.vo.ComplianceCheckVO" extends="complianceCheckMap">
|
||||
<result property="executorName" column="executor_name"></result>
|
||||
<result property="primaryAuditorName" column="primary_auditor_name"></result>
|
||||
<result property="secondaryAuditorId" column="secondary_auditor_name"></result>
|
||||
</resultMap>
|
||||
<sql id="getComplianceCheckVOSQL">
|
||||
SELECT cc.*,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id =cc.executor_id) AS executor_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id =cc.primary_auditor_id) AS primary_auditor_name ,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id =cc.secondary_auditor_id) AS secondary_auditor_name
|
||||
FROM compliance_check cc
|
||||
</sql>
|
||||
|
||||
<select id="getComplianceCheckVOPage" resultMap="complianceCheckVO" resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
|
||||
<include refid="getComplianceCheckVOSQL"></include>
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="getComplianceCheckVOList" resultMap="complianceCheckVO" resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
|
||||
<include refid="getComplianceCheckVOSQL"></include>
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="getComplianceCheckVO" resultMap="complianceCheckVO" resultType="digital.laboratory.platform.reagent.vo.ComplianceCheckVO">
|
||||
SELECT cc.*,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id =cc.executor_id) AS executor_name ,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id =cc.primary_auditor_id) AS primary_auditor_name ,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id =cc.secondary_auditor_id) AS secondary_auditor_name
|
||||
FROM compliance_check cc
|
||||
WHERE cc.compliance_check_id = #{complianceCheckId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -19,23 +19,12 @@
|
||||
<result property="technicalParameter" column="technical_parameter"/>
|
||||
<result property="unitPrice" column="unit_price"/>
|
||||
<result property="purpose" column="purpose"/>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="decentralizeDetailsVO" type="digital.laboratory.platform.reagent.vo.DecentralizeDetailsVO"
|
||||
extends="decentralizeDetailsMap">
|
||||
<result property="englishName" column="english_name"/>
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"/>
|
||||
|
||||
<result property="alias" column="alias"/>
|
||||
<result property="storageCondition" column="storage_condition"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="minimumUnit" column="minimum_unit"/>
|
||||
</resultMap>
|
||||
|
||||
<!--通过条件查询分散采购明细列表-->
|
||||
<select id="getDecentralizeDetailsVOList" resultMap="decentralizeDetailsVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.DecentralizeDetailsVO">
|
||||
SELECT dd.*,
|
||||
(select rc.name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = dd.reagent_consumable_id) As reagent_consumable_name
|
||||
FROM decentralize_details dd
|
||||
WHERE dd.decentralized_request_id = #{decentralizedRequestId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
|
||||
@@ -11,6 +11,9 @@
|
||||
<result property="centralizedRequestId" column="centralized_request_id"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="purchaseCatalogueNumber" column="purchase_catalogue_number"/>
|
||||
<result property="numberOfApplications" column="number_of_applications"/>
|
||||
<result property="replacementReagentConsumableId" column="replacement_reagent_consumable_id"/>
|
||||
<result property="replacementQuantity" column="replacement_quantity"/>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="DetailsOfCentralizedVO" type="digital.laboratory.platform.reagent.vo.DetailsOfCentralizedVO"
|
||||
@@ -23,7 +26,7 @@
|
||||
<select id="getDetailsOfCentralizedVOList" resultMap="DetailsOfCentralizedVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.DetailsOfCentralizedVO">
|
||||
select dc.*,
|
||||
(SELECT rc.name
|
||||
(SELECT rc.reagent_consumable_name
|
||||
FROM reagent_consumables rc
|
||||
WHERE rc.reagent_consumable_id = dc.reagent_consumable_id) AS reagent_consumable_name
|
||||
from details_of_centralized dc
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
<result property="whetherTheSupplierDeliversOnTime" column="whether_the_supplier_delivers_on_time"/>
|
||||
<result property="supplierInformationId" column="supplier_information_id"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="number" column="number"/>
|
||||
</resultMap>
|
||||
<resultMap id="evaluationFormVO" type="digital.laboratory.platform.reagent.vo.EvaluationFormVO"
|
||||
extends="evaluationFormMap">
|
||||
|
||||
@@ -4,29 +4,73 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.PeriodVerificationImplementationMapper">
|
||||
|
||||
<resultMap id="periodVerificationImplementationMap" type="digital.laboratory.platform.reagent.entity.PeriodVerificationImplementation">
|
||||
<id property="periodVerificationImplementationId" column="period_verification_implementation_id"/>
|
||||
<result property="auditOpinionOfTechnical" column="audit_opinion_of_technical"/>
|
||||
<result property="auditResultOfTechnical" column="audit_result_of_technical"/>
|
||||
<result property="auditTimeOfTechnical" column="audit_time_of_technical"/>
|
||||
<result property="causeOfDissatisfaction" column="cause_of_dissatisfaction"/>
|
||||
<result property="checkingTime" column="checking_time"/>
|
||||
<result property="commitStatus" column="commit_status"/>
|
||||
<result property="deviationAndUncertainty" column="deviation_and_uncertainty"/>
|
||||
<result property="implementationAndResults" column="implementation_and_results"/>
|
||||
<result property="inspectorId" column="inspector_id"/>
|
||||
<result property="number" column="number"/>
|
||||
<result property="opinionOfInspector" column="opinion_of_inspector"/>
|
||||
<result property="referenceMaterialId" column="reference_material_id"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="standardValueAndPurity" column="standard_value_and_purity"/>
|
||||
<result property="technicalDirectorId" column="technical_director_id"/>
|
||||
<result property="verificationMethod" column="verification_method"/>
|
||||
<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 id="periodVerificationImplementationMap"
|
||||
type="digital.laboratory.platform.reagent.entity.PeriodVerificationImplementation">
|
||||
<id property="periodVerificationImplementationId" column="period_verification_implementation_id"/>
|
||||
<result property="auditOpinionOfTechnical" column="audit_opinion_of_technical"/>
|
||||
<result property="auditResultOfTechnical" column="audit_result_of_technical"/>
|
||||
<result property="auditTimeOfTechnical" column="audit_time_of_technical"/>
|
||||
<result property="causeOfDissatisfaction" column="cause_of_dissatisfaction"/>
|
||||
<result property="checkingTime" column="checking_time"/>
|
||||
<result property="commitStatus" column="commit_status"/>
|
||||
<result property="deviationAndUncertainty" column="deviation_and_uncertainty"/>
|
||||
<result property="implementationAndResults" column="implementation_and_results"/>
|
||||
<result property="inspectorId" column="inspector_id"/>
|
||||
<result property="number" column="number"/>
|
||||
<result property="opinionOfInspector" column="opinion_of_inspector"/>
|
||||
<result property="referenceMaterialId" column="reference_material_id"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="standardValueAndPurity" column="standard_value_and_purity"/>
|
||||
<result property="technicalDirectorId" column="technical_director_id"/>
|
||||
<result property="verificationMethod" column="verification_method"/>
|
||||
<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="referenceMaterialNumber" column="reference_material_number"/>
|
||||
<result property="periodVerificationPlanId" column="period_verification_plan_id"/>
|
||||
</resultMap>
|
||||
|
||||
<result property="periodVerificationPlanId" column="period_verification_plan_id"/>
|
||||
</resultMap>
|
||||
<resultMap id="periodVerificationImplementationVO" type="digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO"
|
||||
extends="periodVerificationImplementationMap">
|
||||
<result property="inspectorName" column="inspector_name"></result>
|
||||
<result property="referenceMaterialName" column="reference_material_name"></result>
|
||||
<result property="technicalDirectorName" column="technical_director_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getPeriodVerificationImplementationVOSQL">
|
||||
select pvi.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = pvi.reference_material_id) as reference_material_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pvi.inspector_id ) as inspector_nam
|
||||
, (
|
||||
SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pvi.technical_director_id ) as technical_director_name
|
||||
FROM period_verification_implementation pvi
|
||||
|
||||
</sql>
|
||||
|
||||
<select id="getPeriodVerificationImplementationVOPage" resultMap="periodVerificationImplementationVO" resultType="digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO">
|
||||
<include refid="getPeriodVerificationImplementationVOSQL"></include>
|
||||
</select>
|
||||
|
||||
<select id="getPeriodVerificationImplementationVO" resultMap="periodVerificationImplementationVO" resultType="digital.laboratory.platform.reagent.vo.PeriodVerificationImplementationVO">
|
||||
select pvi.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = pvi.reference_material_id) as reference_material_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pvi.inspector_id ) as inspector_nam
|
||||
, (
|
||||
SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pvi.technical_director_id ) as technical_director_name
|
||||
FROM period_verification_implementation pvi
|
||||
WHERE pvi.period_verification_implementation_id = #{periodVerificationImplementationId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -4,30 +4,45 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.PeriodVerificationPlanMapper">
|
||||
|
||||
<resultMap id="periodVerificationPlanMap" type="digital.laboratory.platform.reagent.entity.PeriodVerificationPlan">
|
||||
<id property="periodVerificationPlanId" column="period_verification_plan_id"/>
|
||||
<result property="auditOpinionOfTechnical" column="audit_opinion_of_technical"/>
|
||||
<result property="auditResultOfTechnical" column="audit_result_of_technical"/>
|
||||
<result property="auditTimeOfTechnical" column="audit_time_of_technical"/>
|
||||
<result property="commitStatus" column="commit_status"/>
|
||||
<result property="dateOfNextCheck" column="date_of_next_check"/>
|
||||
<result property="deviationAndUncertainty" column="deviation_and_uncertainty"/>
|
||||
<result property="inspectorId" column="inspector_id"/>
|
||||
<result property="instructionBookId" column="instruction_book_id"/>
|
||||
<result property="number" column="number"/>
|
||||
<result property="plannedVerificationCycle" column="planned_verification_cycle"/>
|
||||
<result property="managerId" column="manager_id"/>
|
||||
<result property="referenceMaterialid" column="reference_materialid"/>
|
||||
<result property="scheduledVerificationDate" column="scheduled_verification_date"/>
|
||||
<result property="standardValueAndPurity" column="standard_value_and_purity"/>
|
||||
<result property="technicalDirectorId" column="technical_director_id"/>
|
||||
<result property="verificationBasis" column="verification_basis"/>
|
||||
<result property="implementationDate" column="implementation_date"/>
|
||||
<result property="verificationResult" column="verification_result"/>
|
||||
<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 id="periodVerificationPlanMap" type="digital.laboratory.platform.reagent.entity.PeriodVerificationPlan">
|
||||
<id property="periodVerificationPlanId" column="period_verification_plan_id"/>
|
||||
<result property="dateOfNextCheck" column="date_of_next_check"/>
|
||||
<result property="deviationAndUncertainty" column="deviation_and_uncertainty"/>
|
||||
<result property="inspectorId" column="inspector_id"/>
|
||||
<result property="referenceMaterialId" column="reference_material_id"/>
|
||||
<result property="instructionBookId" column="instruction_book_id"/>
|
||||
<result property="plannedVerificationCycle" column="planned_verification_cycle"/>
|
||||
<result property="scheduledVerificationDate" column="scheduled_verification_date"/>
|
||||
<result property="standardValueAndPurity" column="standard_value_and_purity"/>
|
||||
<result property="verificationBasis" column="verification_basis"/>
|
||||
<result property="implementationDate" column="implementation_date"/>
|
||||
<result property="verificationResult" column="verification_result"/>
|
||||
<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="checkScheduleId" column="check_schedule_id"/>
|
||||
|
||||
</resultMap>
|
||||
</resultMap>
|
||||
<resultMap id="periodVerificationPlanVO" type="digital.laboratory.platform.reagent.vo.PeriodVerificationPlanVO"
|
||||
extends="periodVerificationPlanMap">
|
||||
<result property="referenceMaterialName" column="reference_material_name"></result>
|
||||
<result property="inspectorName" column="inspector_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getPeriodVerificationPlanVOSQL">
|
||||
select pvp.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = pvp.reference_material_id) as reference_material_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pvp.inspector_id ) as inspector_name
|
||||
from period_verification_plan pvp
|
||||
where pvp.check_schedule_id = #{checkScheduleId}
|
||||
</sql>
|
||||
|
||||
<select id="getPeriodVerificationPlanVOList" resultMap="periodVerificationPlanVO" resultType="digital.laboratory.platform.reagent.vo.PeriodVerificationPlanVO">
|
||||
<include refid="getPeriodVerificationPlanVOSQL"></include>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -4,30 +4,41 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.ProcurementContentMapper">
|
||||
|
||||
<resultMap id="procurementContentMap" type="digital.laboratory.platform.reagent.entity.ProcurementContent">
|
||||
<id property="procurementContentId" column="procurement_content_id"/>
|
||||
<result property="purchasingPlanId" column="purchasing_plan_id"/>
|
||||
<result property="quantity" column="quantity"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="subtotal" column="subtotal"/>
|
||||
<result property="unitPrice" column="unit_price"/>
|
||||
<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 id="procurementContentMap" type="digital.laboratory.platform.reagent.entity.ProcurementContent">
|
||||
<id property="procurementContentId" column="procurement_content_id"/>
|
||||
<result property="purchasingPlanId" column="purchasing_plan_id"/>
|
||||
<result property="quantityPurchased" column="quantity_purchased"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="subtotal" column="subtotal"/>
|
||||
<result property="unitPrice" column="unit_price"/>
|
||||
<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="detailsOfCentralizedId" column="details_of_centralized_id"/>
|
||||
<result property="replacementReagentConsumableId" column="replacement_reagent_consumable_id"/>
|
||||
<result property="replacementQuantity" column="replacement_quantity"/>
|
||||
<result property="replacementPrice" column="replacement_price"/>
|
||||
<result property="numberOfApplications" column="number_of_applications"/>
|
||||
|
||||
</resultMap>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="procurementContentVO" type="digital.laboratory.platform.reagent.vo.ProcurementContentVO" extends="procurementContentMap">
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
|
||||
</resultMap>
|
||||
<resultMap id="procurementContentVO" type="digital.laboratory.platform.reagent.vo.ProcurementContentVO"
|
||||
extends="procurementContentMap">
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
|
||||
<result property="replacementReagentConsumableName" column="replacement_reagent_consumable_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<select id="getProcurementContentVOList" resultMap="procurementContentVO" resultType="digital.laboratory.platform.reagent.vo.ProcurementContentVO">
|
||||
SELECT pc.*,
|
||||
(select rc.name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = pc.reagent_consumable_id) as reagent_consumable_name
|
||||
FROM procurement_content pc
|
||||
WHERE pc.purchasing_plan_id = #{purchasingPlanId}
|
||||
</select>
|
||||
<select id="getProcurementContentVOList" resultMap="procurementContentVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.ProcurementContentVO">
|
||||
SELECT pc.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = pc.reagent_consumable_id) as reagent_consumable_name,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = pc.replacement_reagent_consumable_id) as replacement_reagent_consumable_name
|
||||
FROM procurement_content pc
|
||||
WHERE pc.purchasing_plan_id = #{purchasingPlanId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -16,6 +16,11 @@
|
||||
<result property="releaseDate" column="release_date"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="secondaryAuditorId" column="secondary_auditor_id"/>
|
||||
<result property="number" column="number"/>
|
||||
<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>
|
||||
|
||||
@@ -23,6 +28,8 @@
|
||||
extends="purchaseCatalogueMap">
|
||||
<result property="primaryAuditorName" column="primary_auditor_name"/>
|
||||
<result property="secondaryAuditorName" column="secondary_auditor_name"/>
|
||||
<result property="createName" column="create_name"/>
|
||||
<result property="orgName" column="org_name"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getPurchaseCatalogueVOSQL">
|
||||
@@ -35,6 +42,15 @@
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pc.secondary_auditor_id
|
||||
) AS secondary_auditor_name
|
||||
, (
|
||||
SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pc.create_by
|
||||
) AS create_name
|
||||
, (
|
||||
SELECT org.name
|
||||
FROM dlp_base.sys_org org
|
||||
WHERE org.org_id in (select org_id from dlp_base.sys_user where user_id = pc.create_by)) AS org_name
|
||||
FROM purchase_catalogue pc
|
||||
</sql>
|
||||
|
||||
@@ -49,6 +65,15 @@
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pc.secondary_auditor_id
|
||||
) AS secondary_auditor_name
|
||||
, (
|
||||
SELECT org.name
|
||||
FROM dlp_base.sys_org org
|
||||
WHERE org.org_id in (select org_id from dlp_base.sys_user where user_id = pc.create_by)) AS org_name
|
||||
, (
|
||||
SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=pc.create_by
|
||||
) AS create_name
|
||||
FROM purchase_catalogue pc
|
||||
WHERE pc.purchase_catalogue_id = #{purchaseCatalogueId}
|
||||
</sql>
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="number" column="number"/>
|
||||
|
||||
</resultMap>
|
||||
</mapper>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
<select id="getPurchaseListDetailsVOList" resultMap="purchaseListDetailsVO" resultType="digital.laboratory.platform.reagent.vo.PurchaseListDetailsVO">
|
||||
SELECT pd.*,
|
||||
(select rc.name from reagent_consumables rc where rc.reagent_consumable_id = pd.reagent_consumable_id),AS reagent_consumable_name
|
||||
(select rc.reagent_consumable_name from reagent_consumables rc where rc.reagent_consumable_id = pd.reagent_consumable_id) AS reagent_consumable_name
|
||||
FROM purchase_list_details pd
|
||||
WHERE pd.purchase_list_id = #{purchaseListId}
|
||||
</select>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<result property="status" column="status"/>
|
||||
<result property="primaryAuditorId" column="primary_auditor_id"/>
|
||||
<result property="createId" column="create_id"/>
|
||||
<result property="number" column="number"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
@@ -31,6 +32,7 @@
|
||||
<result property="primaryAuditorName" column="primary_auditor_name"></result>
|
||||
<result property="approverName" column="approver_name"></result>
|
||||
<result property="createName" column="create_name"></result>
|
||||
<result property="orgName" column="org_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getPurchasingPlanVOSQL">
|
||||
@@ -38,7 +40,11 @@
|
||||
(select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id = pp.primary_auditor_id) as primary_auditor_name
|
||||
, (
|
||||
,
|
||||
(SELECT org.name
|
||||
FROM dlp_base.sys_org org
|
||||
WHERE org.org_id in (select org_id from dlp_base.sys_user where user_id = pp.create_id)) AS org_name,
|
||||
(
|
||||
select user.name
|
||||
from dlp_base.sys_user user
|
||||
where user.user_id = pp.approver_id) as approver_name
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<result property="category" column="category"/>
|
||||
<result property="deviationOrUncertainty" column="deviation_or_uncertainty"/>
|
||||
<result property="instructionBookId" column="instruction_book_id"/>
|
||||
<result property="reagentConsumablesName" column="reagent_consumables_name"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="specificationAndModel" column="specification_and_model"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
@@ -19,6 +19,8 @@
|
||||
<result property="standardValueOrPurity" column="standard_value_or_purity"/>
|
||||
<result property="technicalParameter" column="technical_parameter"/>
|
||||
<result property="totalQuantity" column="total_quantity"/>
|
||||
<result property="species" column="species"/>
|
||||
<result property="packagedCopies" column="packaged_copies"/>
|
||||
|
||||
</resultMap>
|
||||
</mapper>
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.ReagentConsumablesMapper">
|
||||
|
||||
<resultMap id="reagentConsumablesMap" type="digital.laboratory.platform.reagent.entity.ReagentConsumables">
|
||||
<id property="reagentConsumablesId" column="reagent_consumables_id"/>
|
||||
<id property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="brand" column="brand"/>
|
||||
<result property="catagory" column="catagory"/>
|
||||
<result property="category" column="category"/>
|
||||
<result property="deviationOrUncertainty" column="deviation_or_uncertainty"/>
|
||||
<result property="name" column="name"/>
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"/>
|
||||
<result property="species" column="species"/>
|
||||
<result property="specificationAndModel" column="specification_and_model"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
@@ -19,6 +19,15 @@
|
||||
<result property="standardValueOrPurity" column="standard_value_or_purity"/>
|
||||
<result property="technicalParameter" column="technical_parameter"/>
|
||||
<result property="unitPrice" column="unit_price"/>
|
||||
<result property="englishName" column="english_name"/>
|
||||
<result property="packagedCopies" column="packaged_copies"/>
|
||||
<result property="alias" column="alias"/>
|
||||
<result property="storageCondition" column="storage_condition"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="minimumUnit" column="minimum_unit"/>
|
||||
<result property="number" column="number"/>
|
||||
|
||||
|
||||
|
||||
</resultMap>
|
||||
</mapper>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.ReagentConsumablesSetMapper">
|
||||
|
||||
<resultMap id="reagentConsumablesSetMap" type="digital.laboratory.platform.reagent.entity.ReagentConsumablesSet">
|
||||
<id property="reagentConsumablesSetid" column="reagent_consumables_setID"/>
|
||||
<id property="reagentConsumablesSetId" column="reagent_consumables_set_id"/>
|
||||
<result property="applicationForUseId" column="application_for_use_id"/>
|
||||
<result property="quantity" column="quantity"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
@@ -13,6 +13,8 @@
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="purpose" column="purpose"/>
|
||||
<result property="batchDetailsId" column="batch_details_id"/>
|
||||
</resultMap>
|
||||
</mapper>
|
||||
|
||||
@@ -4,18 +4,42 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.RequisitionRecordMapper">
|
||||
|
||||
<resultMap id="requisitionRecordMap" type="digital.laboratory.platform.reagent.entity.RequisitionRecord">
|
||||
<id property="requisitionRecordId" column="requisition_record_id"/>
|
||||
<result property="dateOfClaim" column="date_of_claim"/>
|
||||
<result property="drawingamount" column="drawingamount"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="recipientId" column="recipient_id"/>
|
||||
<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="specificationAndModel" column="specification_and_model"/>
|
||||
<resultMap id="requisitionRecordMap" type="digital.laboratory.platform.reagent.entity.RequisitionRecord">
|
||||
<id property="requisitionRecordId" column="requisition_record_id"/>
|
||||
<result property="dateOfClaim" column="date_of_claim"/>
|
||||
<result property="drawingAmount" column="drawing_amount"/>
|
||||
<result property="reagentConsumableId" column="reagent_consumable_id"/>
|
||||
<result property="recipientId" column="recipient_id"/>
|
||||
<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="specificationAndModel" column="specification_and_model"/>
|
||||
<result property="number" column="number"/>
|
||||
|
||||
</resultMap>
|
||||
</resultMap>
|
||||
|
||||
<resultMap id="requisitionRecordVO" type="digital.laboratory.platform.reagent.vo.RequisitionRecordVO"
|
||||
extends="requisitionRecordMap">
|
||||
<result property="recipientName" column="recipient_name"></result>
|
||||
<result property="reagentConsumableName" column="reagent_consumable_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getRequisitionRecordVOSQL">
|
||||
SELECT rr.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = rr.reagent_consumable_id) as reagent_consumable_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=rr.recipient_id
|
||||
) AS recipient_name
|
||||
|
||||
FROM requisition_record rr
|
||||
</sql>
|
||||
|
||||
<select id="getRequisitionRecordVOPage" resultMap="requisitionRecordVO" resultType="digital.laboratory.platform.reagent.vo.RequisitionRecordVO">
|
||||
<include refid="getRequisitionRecordVOSQL"></include>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -1,49 +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.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="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 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>
|
||||
@@ -1,55 +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.SigningRecordFormMapper">
|
||||
|
||||
<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="status" column="status"/>
|
||||
<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,26 +4,68 @@
|
||||
|
||||
<mapper namespace="digital.laboratory.platform.reagent.mapper.StandardMaterialApplicationMapper">
|
||||
|
||||
<resultMap id="standardMaterialApplicationMap" type="digital.laboratory.platform.reagent.entity.StandardMaterialApplication">
|
||||
<id property="standardMaterialApplicationId" column="standard_material_application_id"/>
|
||||
<result property="administratorId" column="administrator_id"/>
|
||||
<result property="dateOfClaim" column="date_of_claim"/>
|
||||
<result property="dateOfReturn" column="date_of_return"/>
|
||||
<result property="purposeAndQuantityOfUse" column="purpose_and_quantity_of_use"/>
|
||||
<result property="recipientId" column="recipient_id"/>
|
||||
<result property="referenceMaterialNumber" column="reference_material_number"/>
|
||||
<result property="referenceSubstanceId" column="reference_substance_id"/>
|
||||
<result property="requisitionedQuantity" column="requisitioned_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="serialNumber" column="serial_number"/>
|
||||
<result property="specification" column="specification"/>
|
||||
<resultMap id="standardMaterialApplicationMap"
|
||||
type="digital.laboratory.platform.reagent.entity.StandardMaterialApplication">
|
||||
<id property="standardMaterialApplicationId" column="standard_material_application_id"/>
|
||||
<result property="administratorId" column="administrator_id"/>
|
||||
<result property="dateOfClaim" column="date_of_claim"/>
|
||||
<result property="dateOfReturn" column="date_of_return"/>
|
||||
<result property="purposeAndQuantity" column="purpose_and_quantity"/>
|
||||
<result property="recipientId" column="recipient_id"/>
|
||||
<result property="referenceMaterialNumber" column="reference_material_number"/>
|
||||
<result property="referenceSubstanceId" column="reference_substance_id"/>
|
||||
<result property="requisitionedQuantity" column="requisitioned_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="serialNumber" column="serial_number"/>
|
||||
<result property="specification" column="specification"/>
|
||||
<result property="deliveryRegistrationFormId" column="delivery_registration_form_id"/>
|
||||
<result property="requisitionRecordId" column="requisition_record_id"/>
|
||||
<result property="storageRegistrationFormId" column="storage_registration_form_id"/>
|
||||
<result property="claimCode" column="claim_code"/>
|
||||
<result property="purpose" column="purpose"/>
|
||||
<result property="number" column="number"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="applicationForUseId" column="application_for_use_id"/>
|
||||
</resultMap>
|
||||
|
||||
<result property="deliveryRegistrationFormId" column="delivery_registration_form_id"/>
|
||||
<result property="requisitionRecordId" column="requisition_record_id"/>
|
||||
<result property="storageRegistrationFormId" column="storage_registration_form_id"/>
|
||||
<result property="claimCode" column="claim_code"/>
|
||||
</resultMap>
|
||||
<resultMap id="standardMaterialApplicationVO"
|
||||
type="digital.laboratory.platform.reagent.vo.StandardMaterialApplicationVO"
|
||||
extends="standardMaterialApplicationMap">
|
||||
<result property="referenceSubstanceName" column="reference_substance_name"></result>
|
||||
<result property="recipientName" column="recipient_name"></result>
|
||||
</resultMap>
|
||||
|
||||
<sql id="getStandardMaterialApplicationVOSQL">
|
||||
select sma.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = sma.reference_substance_id) as reference_substance_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=sma.recipient_id
|
||||
) AS recipient_name
|
||||
from standard_material_application sma
|
||||
</sql>
|
||||
|
||||
<select id="getStandardMaterialApplicationVOPage" resultMap="standardMaterialApplicationVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.StandardMaterialApplicationVO">
|
||||
<include refid="getStandardMaterialApplicationVOSQL"></include>
|
||||
</select>
|
||||
|
||||
<select id="getStandardMaterialApplicationVOList" resultMap="standardMaterialApplicationVO"
|
||||
resultType="digital.laboratory.platform.reagent.vo.StandardMaterialApplicationVO">
|
||||
select sma.*,
|
||||
(select rc.reagent_consumable_name
|
||||
from reagent_consumables rc
|
||||
where rc.reagent_consumable_id = sma.reference_substance_id) as reference_substance_name,
|
||||
(SELECT user.name
|
||||
FROM dlp_base.sys_user user
|
||||
WHERE user.user_id=sma.recipient_id
|
||||
) AS recipient_name
|
||||
from standard_material_application sma
|
||||
where sma.status = 1
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
<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>
|
||||
|
||||
<resultMap id="storageRegistrationFormVO" type="digital.laboratory.platform.reagent.vo.StorageRegistrationFormVO"
|
||||
|
||||
@@ -18,9 +18,9 @@
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="supplierCoding" column="supplier_coding"/>
|
||||
<result property="supplierIdnumber" column="supplier_idnumber"/>
|
||||
<result property="supplierIdNumber" column="supplier_id_number"/>
|
||||
<result property="supplierName" column="supplier_name"/>
|
||||
<result property="supplierTelephone" column="supplier_telephone"/>
|
||||
|
||||
<result property="number" column="number"/>
|
||||
</resultMap>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user