Merge remote-tracking branch 'origin/master'

zd-modules/zd-chemical/src/main/resources/mapper/chemical/ActHxpapplyMapper.xml

@@ -292,17 +292,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and ak.approval_status = #{approvalStatus}
             </if>
             <if test="beginCreateTime != null and beginCreateTime != ''"><!-- 申请开始时间 -->
-            AND date_format(ak.create_time,'%y%m%d') &gt;= date_format(#{beginCreateTime},'%y%m%d')
+            AND date_format(ah.create_time,'%y%m%d') &gt;= date_format(#{beginCreateTime},'%y%m%d')
             </if>
             <if test="endCreateTime != null and endCreateTime != ''"><!-- 申请结束时间 -->
-            AND date_format(ak.create_time,'%y%m%d') &lt;= date_format(#{endCreateTime},'%y%m%d')
+            AND date_format(ah.create_time,'%y%m%d') &lt;= date_format(#{endCreateTime},'%y%m%d')
             </if>
 
             <if test="beginOverTime != null and beginOverTime != ''"><!-- 完成开始时间 -->
-            AND date_format(ak.over_time,'%y%m%d') &gt;= date_format(#{beginOverTime},'%y%m%d')
+            AND date_format(ah.over_time,'%y%m%d') &gt;= date_format(#{beginOverTime},'%y%m%d')
             </if>
             <if test="endOverTime != null and endOverTime != ''"><!-- 完成结束时间 -->
-            AND date_format(ak.over_time,'%y%m%d') &lt;= date_format(#{endOverTime},'%y%m%d')
+            AND date_format(ah.over_time,'%y%m%d') &lt;= date_format(#{endOverTime},'%y%m%d')
             </if>
             <if test="userId != null and userId != ''"><!-- 创建人id -->
                 and ah.user_id = #{userId}