tx-lims-after.git

			@@ -5,6 +5,7 @@
			<!-- 通用查询映射结果 -->
			<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.AuxiliaryWorkingHours">
			<id column="id" property="id" />
			<result column="number" property="number"/>
			<result column="AuxiliaryProject" property="auxiliaryProject" />
			<result column="approved_working_hour" property="approvedWorkingHour" />
			<result column="remarks" property="remarks" />
			@@ -12,9 +13,9 @@
			<result column="update_user" property="updateUser" />
			<result column="create_time" property="createTime" />
			<result column="update_time" property="updateTime" />
			<result column="e_id" property="eId" />
			<result column="department" property="department" />
			<result column="laboratory" property="laboratory" />
			<result column="unit" property="unit"/>
			</resultMap>
			<select id="selectAuxiliaryWorkingHours" resultType="com.yuanchu.mom.pojo.AuxiliaryWorkingHours">
			select data.*
			@@ -24,12 +25,11 @@
			awh.number,
			awh.auxiliary_project,
			awh.laboratory,
			enu.label,
			awh.unit,
			awh.approved_working_hour,
			awh.department,
			awh.remarks
			FROM auxiliary_working_hours awh
			left JOIN enums enu on enu.id = awh.e_id
			) data
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			${ew.customSqlSegment}