新增检验修改

zss

2023-08-26 f1d445b9d51abb020cbcd4a61b4edd36fbe75216

 inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml

@@ -17,7 +17,7 @@
            AND d.`sample_name` like concat('%', #{sampleName}, '%')
        </if>
        <if test="entrusted != null and entrusted != null">
            AND l.`contacts` like concat('%', #{entrusted}, '%')
            AND l.`entrusted` like concat('%', #{entrusted}, '%')
        </if>
        <if test="inspectionStatus != null and inspectionStatus != null">
            AND d.`inspection_status` = #{inspectionStatus}
@@ -25,19 +25,21 @@
    </select>

    <select id="selectLinkAll" resultType="java.util.Map">
        SELECT DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d')  formTime,
               l.`entrusted` supplier,
               d.`sample_number` mcode,
               d.`sample_name` name,
               d.`specifications_models` specifications,
        SELECT d.id ,
            DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
               l.`entrusted`                                supplier,
               d.`sample_number`                            mcode,
               d.`sample_name`                              name,
               d.`specifications_models`                    specifications,
               d.`unit`,
               d.`samples_number` num,
               DATE_FORMAT(date_survey,'%Y-%m-%d')  startTime,
               DATE_FORMAT(completion_deadline,'%Y-%m-%d') endTime
               d.`samples_number`                           num,
               experiment,
               DATE_FORMAT(date_survey, '%Y-%m-%d')         startTime,
               DATE_FORMAT(completion_deadline, '%Y-%m-%d') endTime
        FROM lims_laboratory.link_basic_information l,
             lims_laboratory.link_detection d
        WHERE l.`id` = d.`link_basic_id`
          AND l.`state` = 1
          and inspection_status = 1
    </select>

</mapper>