lims-after.git - Gitblit

			@@ -2,14 +2,15 @@
			<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.yuanchu.limslaboratory.mapper.LinkBasicInformationMapper">
			<select id="getLinkBasicPage" resultType="map">
			SELECT l.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
			SELECT d.`id`, l.`entrust_coding`, l.`entrusted`, d.`samples_number`, d.`sample_name`,
			d.`specifications_models`,
			DATE_FORMAT(l.`inspection_time`,'%Y-%m-%d') inspectionTime, DATE_FORMAT(l.`completion_deadline`,'%Y-%m-%d')
			completionDeadline, l.`contacts`,
			DATE_FORMAT(d.`date_survey`,'%Y-%m-%d') dateSurvey, d.`inspection_status`
			FROM link_basic_information l, link_detection d
			WHERE l.`id` = d.`link_basic_id`
			AND l.`state` = 1
			AND d.`state` = 1
			and l.`state` = 1
			<if test="entrustCoding != null and entrustCoding != null">
			AND l.`entrust_coding` like concat('%', #{entrustCoding}, '%')
			</if>
			@@ -25,19 +26,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>