Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250218 更新

Browse Source
This commit is contained in:
陈江保
2025-02-18 17:57:42 +08:00
parent 8c8903148e
commit 4db1ffe3b7
12 changed files with 437 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/resources/mapper/EntrustMaterialCheckoutResultMapper.xml
View File

@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="digital.laboratory.platform.entrustment.entity.EntrustMaterialCheckoutResult">
<id property="id" column="entrust_material_id" jdbcType="VARCHAR"/>
<result property="entrustId" column="entrust_id" jdbcType="VARCHAR"/>
<result property="qualitativeResult" column="qualitative_result" jdbcType="VARCHAR" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
<result property="quantitativeResult" column="quantitative_result" jdbcType="VARCHAR"/>
<result property="otherResult" column="other_result" jdbcType="VARCHAR"/>
@@ -15,14 +16,41 @@
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
</resultMap>
<resultMap id="EntrustMaterialCheckoutResultVO" type="digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO" extends="BaseResultMap">
<result property="name" column ="name"/>
<result property="orderNo" column ="order_no"/>
</resultMap>
<sql id="Base_Column_List">
entrust_material_id,
qualitative_result,
quantitative_result,
other_result,
create_time,
create_by,
update_time,
update_by
emr.entrust_material_id,
emr.entrust_id,
emr.qualitative_result,
emr.quantitative_result,
emr.other_result,
emr.create_time,
emr.create_by,
emr.update_time,
emr.update_by
</sql>
<sql id="getEntrustMaterialCheckoutResultVO">
SELECT
<include refid="Base_Column_List"/>,
em.name,
em.entrustment_id,
em.order_no
FROM b_entrust_material_checkout_result emr
LEFT JOIN b_entrustment_identification_material em
ON emr.entrust_material_id = em.id
</sql>
<select id="getEntrustMaterialCheckoutResultVOPage" resultMap="EntrustMaterialCheckoutResultVO" resultType="digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO">
<include refid="getEntrustMaterialCheckoutResultVO"/>
${ew.customSqlSegment}
</select>
<select id="voList" resultMap="EntrustMaterialCheckoutResultVO" resultType="digital.laboratory.platform.entrustment.vo.EntrustMaterialCheckoutResultVO">
<include refid="getEntrustMaterialCheckoutResultVO"/>
${ew.customSqlSegment}
</select>
</mapper>

307
src/main/resources/mapper/EntrustmentMapper.xml
View File

@@ -147,92 +147,230 @@
</resultMap>
<sql id="BaseColumnList" >
e.id,
e.case_id,
e.entrustment_no,
e.third_sys_entrust_no,
e.entrustment_type,
e.business_type,
e.process_instance_id,
e.identification_id,
e.entrustment_time,
e.submitter,
e.submit_time,
e.client_org_id,
e.client_org_name,
e.client_address,
e.client_postcode,
e.client_tel,
e.client_fax,
e.identification_domain,
e.identification_org_name,
e.qualitative_analysis,
e.quantitative_analysis,
e.other_identification_requests,
e.candidate_drugs,
e.is_client_specified_method,
e.client_specified_method,
e.destructive_analysis,
e.other_identification_notes,
e.reidentification,
e.old_identification_org_name,
e.old_identification_document,
e.old_identification_result,
e.reidentification_reason,
e.avoid_identifier,
e.specified_identifier,
e.other_agreement,
e.comments,
e.check_candidate_user,
e.check_claim_user,
e.check_claim_time,
e.check_user,
e.check_time,
e.check_comments,
e.check_times,
e.check_all_identification_material_confirmed,
e.approve_candidate_user,
e.approve_claim_user,
e.approve_claim_time,
e.approve_user,
e.approve_time,
e.approve_comments,
e.approve_times,
e.deliver_confirm_user,
e.deliver_confirm_time,
e.deliver_confirm_comments,
e.deliver_time,
e.deliver_submitter,
e.deliverer1_name,
e.deliverer1_position,
e.deliverer1_cert,
e.deliverer1_id,
e.deliverer1_phone,
e.deliverer2_name,
e.deliverer2_position,
e.deliverer2_cert,
e.deliverer2_id,
e.deliverer2_phone,
e.accept_claim_user,
e.accept_claim_time,
e.accept_no,
e.accept_user,
e.accept_time,
e.accept_comments,
e.identification_items_confirm_printed,
e.process_info,
e.report_receive_mode,
e.report_receiver1_user_id,
e.report_receiver1_name,
e.report_receiver1_position,
e.report_receiver1_cert,
e.report_receiver1_id,
e.report_receiver1_phone,
e.report_receiver2_user_id,
e.report_receiver2_name,
e.report_receiver2_position,
e.report_receiver2_cert,
e.report_receiver2_id,
e.report_receiver2_phone,
e.report_sender_user_id,
e.report_sent_time,
e.report_receiver1_signature,
e.report_receiver2_signature,
e.sample_receive_mode,
e.sample_receiver1_user_id,
e.sample_receiver1_name,
e.sample_receiver1_position,
e.sample_receiver1_cret,
e.sample_receiver1_id,
e.sample_receiver1_phone,
e.sample_receiver2_user_id,
e.sample_receiver2_name,
e.sample_receiver2_position,
e.sample_receiver2_cret,
e.sample_receiver2_id,
e.sample_receiver2_phone,
e.sample_sender_user_id,
e.sample_sent_time,
e.sample_receiver1_person_signature,
e.sample_receiver2_person_signnature,
e.status,
e.previous_status,
e.create_time,
e.create_by,
e.update_time,
e.update_by,
e.entrustment_letter_path,
e.identification_items_confirm_path,
e.transfer_status,
e.transfer_oper_signnature,
e.transfer_get_signnature,
e.transfer_name,
e.transfer_no,
e.accept_need_professional,
e.data_sources,
e.accept_no_third_sys,
e.entrust_requirement,
e.post_address,
e.return_or_not,
e.is_trans,
e.type
</sql>
<sql id="getEntrustmentVOSQL">
SELECT e.*,
c.case_name,
c.case_no,
c.case_brief,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.submitter
) AS submitter_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.check_claim_user
) AS check_claim_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.check_user
) AS check_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.approve_claim_user
) AS approve_claim_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.approve_user
) AS approve_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.deliver_confirm_user
) AS deliver_confirm_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.deliver_submitter
) AS deliver_submitter_name,
-- (
-- SELECT user.name
-- FROM dlp_base.sys_user user
-- WHERE user.user_id=e.accept_claim_user
-- ) AS accept_claim_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.accept_user
) AS accept_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.report_sender_user_id
) AS report_sender_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.sample_sender_user_id
) AS sample_sender_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.create_by
) AS create_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.update_by
) AS update_user_name,
SELECT
<include refid="BaseColumnList"></include>,
c.case_name,
c.case_no,
c.case_brief,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.submitter
) AS submitter_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.check_claim_user
) AS check_claim_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.check_user
) AS check_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.approve_claim_user
) AS approve_claim_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.approve_user
) AS approve_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.deliver_confirm_user
) AS deliver_confirm_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.deliver_submitter
) AS deliver_submitter_name,
-- (
-- SELECT user.name
-- FROM dlp_base.sys_user user
-- WHERE user.user_id=e.accept_claim_user
-- ) AS accept_claim_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.accept_user
) AS accept_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.report_sender_user_id
) AS report_sender_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.sample_sender_user_id
) AS sample_sender_user_name,
(
SELECT COUNT(*)
FROM b_entrustment_identification_material eim
WHERE eim.entrustment_id=e.id
) AS identification_material_count,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.create_by
) AS create_user_name,
(
SELECT user.name
FROM dlp_base.sys_user user
WHERE user.user_id=e.update_by
) AS update_user_name,
(
select identification_no
from b_identification i
where i.id = e.identification_id
) as identification_no
(
SELECT COUNT(*)
FROM b_entrustment_identification_material eim
WHERE eim.entrustment_id=e.id
) AS identification_material_count,
(
select identification_no
from b_identification i
where i.id = e.identification_id
) as identification_no,
(
SELECT COUNT(*) FROM b_entrust_material_checkout_result emr WHERE emr.entrust_id = e.id
) AS checkout_result_count
FROM b_entrustment e
LEFT JOIN b_case_event c on e.case_id=c.id
FROM b_entrustment e
LEFT JOIN b_case_event c on e.case_id=c.id
</sql>
<!-- 取委托列表分页 -->
@@ -282,6 +420,9 @@
where d.id = #{id}
</select>
<!-- 根据检材结果获取委托列表 -->
<select id="getEntrustmentVOListByResult" resultMap="entrustmentVO">
<include refid="getEntrustmentVOSQL"/>
LEFT JOIN b_entrust_material_checkout_result emr ON e.id = emr.entrustment_id
</select>
</mapper>