气瓶信息修改

zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/mapper/BottleStorageMapper.xml

@@ -28,6 +28,7 @@
         <result column="dept_name" property="deptName"/>
         <result column="subject_id" property="subjectId"/>
         <result column="subject_name" property="subjectName"/>
+        <result column="air_name" property="airName"/>
         <result column="air_component" property="airComponent"/>
         <result column="config_name" property="configName"/>
         <result column="create_by" property="createBy"/>
@@ -82,8 +83,8 @@
             or bs.air_number like concat('%', #{searchValue}, '%') )
         </if>
         <if test="storageStatus != null ">and storage_status = #{storageStatus}</if>
-        <if test="startTime != null "> and date_format(ur.use_time,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')</if>
-        <if test="endTime != null "> and date_format(ur.use_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')</if>
+        <if test="startTime != null "> and date_format(bs.create_time,'%Y-%m-%d') &gt;= date_format(#{startTime},'%Y-%m-%d')</if>
+        <if test="endTime != null "> and date_format(bs.create_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')</if>
     </select>
 
     <select id="returnGas" parameterType="com.zd.bottle.vo.BottleStorageUseVo" resultType="com.zd.bottle.vo.BottleStorageUseVo">