jfpt-BladeX.git

			@@ -228,7 +228,7 @@
			</select>

			<!--导出健康码数据表格-->
			<select id="exportHealthcode" resultType="org.springblade.jfpt.healthcode.vo.HealthcodeExcel">
			<select id="exportHealthcode" resultType="org.springblade.common.entity.HealthcodeExcel">
			SELECT * FROM healthcode
			where 1=1
			<if test="healthcodeVO.status==0">
			@@ -240,7 +240,7 @@
			<if test="healthcodeVO.status==2">
			and date_format(dtime,'%Y%m') = date_format(now(),'%Y%m')
			</if>
			<if test="healthcodeVO.type!=null">
			<if test="healthcodeVO.type!=null and healthcodeVO.type!='undefined' ">
			and type=#{healthcodeVO.type}
			</if>
			<if test="healthcodeVO.province!=null">
			@@ -252,10 +252,11 @@
			<if test="healthcodeVO.district!=null">
			and district like concat('%',#{healthcodeVO.district},'%')
			</if>
			<if test="healthcodeVO.begTime!=null and healthcodeVO.begTime!='' and healthcodeVO.endTime!=null and healthcodeVO.endTime!='' ">
			<if test="healthcodeVO.begTime!=null and healthcodeVO.begTime!='' and healthcodeVO.begTime!='undefined' and healthcodeVO.endTime!='undefined'
			and healthcodeVO.endTime!=null and healthcodeVO.endTime!='' ">
			and date(dtime) between #{healthcodeVO.begTime} and #{healthcodeVO.endTime}
			</if>
			<if test="healthcodeVO.timeDesc!=null and healthcodeVO.timeDesc!=''">
			<if test="healthcodeVO.timeDesc!=null and healthcodeVO.timeDesc!='' and healthcodeVO.timeDesc!='undefined' ">
			<if test="healthcodeVO.timeDesc=='0-2'">
			and hour(dtime)>=0 and hour(dtime) <2
			</if>