2022-10-25 修改控制记录时间查询问题，和枚举返回类型。

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabControlMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.zd.laboratory.domain.vo.LabControlVO" id="LabControlVOResult">
         <result property="subjectName"    column="subject_name"    />
+        <result property="hardwareType"    column="hardware_type"  typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"  />
 <!--        <result property="hardwareTypeEnum"    column="hardware_type_enum"    />-->
 
     </resultMap>
@@ -74,11 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ancestors) ))
             </if>
             <if test="subjectId != null and subjectId != ''"> and xx.subject_id = #{subjectId}</if>
-            <if test="beginTime != null ">
-                and str_to_date(xx.create_time,'%Y-%m-%d') >= #{beginTime}
+            <if test="beginTimeStr != null ">
+                and str_to_date(xx.create_time,'%Y-%m-%d') >= #{beginTimeStr}
             </if>
-            <if test="endTime != null ">
-                and str_to_date(xx.create_time,'%Y-%m-%d') &lt;= #{endTime}
+            <if test="endTimeStr != null ">
+                and str_to_date(xx.create_time,'%Y-%m-%d') &lt;= #{endTimeStr}
             </if>
             <!-- 数据范围过滤 -->
             ${params.dataScope}