~jiangyouyao/beauty-erp.git

			@@ -854,10 +854,11 @@
			group by b.id) t
			</select>

			<select id="selectHasValidProjUse" resultMap="SysProjUseMap">
			select * from sys_proj_use
			where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d') and STATUS='有效'
			</select>
			<update id="updateInvalidProjUse" >
			update sys_proj_use set STATUS='无效'
			where date_format(now(), '%Y-%m-%d') > date_format(FAIL_TIME, '%Y-%m-%d')
			and STATUS='有效'
			</update>

			<resultMap type="SysProjUse" id="TaoCanWithProjMap">

			@@ -896,6 +897,7 @@
			<result property="timeLength" column="proj_time_length"/>
			<result property="img" column="proj_img"/>
			<result property="projId" column="proj_projId"/>
			<result property="status" column="proj_status"/>
			</collection>
			</resultMap>

			@@ -911,6 +913,7 @@
			e.SURPLUS_COUNT proj_SURPLUS_COUNT,
			e.id proj_info_id,
			e.proj_id proj_projId,
			e.status proj_status,
			f.time_length proj_time_length,
			f.img proj_img
			from sys_proj_use a
			@@ -921,7 +924,7 @@
			left join shopping_goods f on e.proj_id=f.id
			where 1=1 and a.type='套餐' and a.TAOCAN_ID IS NULL
			<if test="record.queryKey != null and record.queryKey !='' ">
			and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(goods_no, #{record.queryKey}))
			and (instr(b.name, #{record.queryKey}) or instr(b.zjm, #{record.queryKey}) or instr(b.goods_no, #{record.queryKey}))
			</if>
			<if test="record.isOver != null and record.isOver !='' ">
			and a.IS_OVER = #{record.isOver}