20250325 更新

1.添加 相关的检验数据转换器
2.批量更新检验数据以及计算保留时间相对偏差和离子丰度比
This commit is contained in:
2025-03-25 18:02:39 +08:00
parent 6f087e2556
commit 262c96c875
15 changed files with 416 additions and 146 deletions

View File

@@ -28,7 +28,7 @@
exp.base_peak,
exp.ion_abundance_ratio,
exp.ion_abundance_ratio_error,
exp.fragment_ret_time
exp.fragment_ret_time,
exp.ion_abundance_ratio_within_error,
exp.mass_to_charge_ratio,
exp.qualitative_ion_pair,
@@ -45,4 +45,10 @@
LEFT JOIN b_test_record_sampledata test ON exp.test_data_id = test.id
</sql>
<select id="queryExpandDataByTestDataId" resultType="digital.laboratory.platform.inspection.entity.TestRecordSampleDataExpand">
SELECT
<include refid="Base_Column_List"></include>
FROM b_test_record_sampledata_expand exp WHERE exp.test_data_id = #{testDataId}
</select>
</mapper>

View File

@@ -25,6 +25,34 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="compoundCnName" column="compound_cn_name" jdbcType="VARCHAR"/>
<result property="whetherCheckOut" column="whether_check_out" jdbcType="VARCHAR"/>
</resultMap>
<resultMap id="VOMap" type="digital.laboratory.platform.inspection.vo.TestRecordSampleDataVO">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="sampleNo" column="sample_no" jdbcType="VARCHAR"/>
<result property="testId" column="test_id" jdbcType="VARCHAR"/>
<result property="stdConcentration" column="std_concentration" jdbcType="VARCHAR"/>
<result property="sampleConcentration" column="sample_concentration" jdbcType="VARCHAR"/>
<result property="compoundName" column="compound_name" jdbcType="VARCHAR"/>
<result property="rtTimeWithinError" column="rt_time_within_error" jdbcType="VARCHAR"/>
<result property="rtTimeError" column="rt_time_error" jdbcType="DOUBLE"/>
<result property="targetRtTime" column="target_rt_time" jdbcType="DOUBLE"/>
<result property="stdRtTime" column="std_rt_time" jdbcType="DOUBLE"/>
<result property="isDetected" column="is_detected" jdbcType="INTEGER"/>
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
<result property="dataJson" column="data_json" jdbcType="VARCHAR"/>
<result property="dataResultJson" column="data_result_json" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="TINYINT"/>
<result property="compoundCnName" column="compound_cn_name" jdbcType="VARCHAR"/>
<result property="whetherCheckOut" column="whether_check_out" jdbcType="VARCHAR"/>
<collection
property="expandList"
ofType="digital.laboratory.platform.inspection.entity.TestRecordSampleDataExpand"
javaType="java.util.List"
column="id"
select="digital.laboratory.platform.inspection.mapper.TestRecordSampleDataExpandMapper.queryExpandDataByTestDataId" />
</resultMap>
<sql id="Base_Column_List">
@@ -48,8 +76,17 @@
create_by,
update_time,
update_by,
compound_cn_name
compound_cn_name,
whether_check_out
</sql>
<select id="queryTestRecordSampleDataVOList" resultMap="VOMap">
SELECT
<include refid="Base_Column_List"></include>
FROM b_test_record_sampledata
${ew.customSqlSegment}
</select>
<!-- 合并委托、任务、筛查表-->
<sql id="queryCommoneBusinessSql">
SELECT T.id,