~jiangyouyao/beauty-erp.git

			@@ -137,9 +137,9 @@
			d.id as pu_id,
			d.SURPLUS_COUNT as pu_SURPLUS_COUNT,
			d.ASSEMBLE_ID as pu_ASSEMBLE_ID,
			d.price as pu_price


			d.price as pu_price,
			d.taocan_id as pu_taocan_id,
			d.source as pu_source
			from sys_beautician_state a
			left join sys_users b on a.staff_id= b.su_id
			left join shopping_goods c on a.proj_id=c.id
			@@ -147,10 +147,14 @@
			where a.SERVICES_ID =#{serId}
			</select>

			<!-- EXC_TIME =TIMESTAMPDIFF(MINUTE,BEGIN_TIME,now()) -->
			<update id="chengItemState">
			update sys_beautician_state set state=#{record.state},
			EXC_TIME =TIMESTAMPDIFF(MINUTE,BEGIN_TIME,now())
			where STAFF_ID=#{record.staffId} and SERVICES_ID =#{record.servicesId}
			update sys_beautician_state set state=#{record.state}
			where 1=1
			<if test="record.staffId != null">
			and STAFF_ID=#{record.staffId}
			</if>
			and SERVICES_ID =#{record.servicesId}
			</update>

			<!-- 根据id更新部分更新 -->
			@@ -172,7 +176,7 @@
			<if test="servicesId != null and servicesId !='' ">
			SERVICES_ID = #{servicesId},
			</if>
			<if test="servicesId != null and servicesId !='' ">
			<if test="excTime != null and excTime !='' ">
			EXC_TIME = #{excTime},
			</if>

			@@ -327,6 +331,9 @@
			<![CDATA[ a.BEGIN_TIME > #{beginTime}
			and a.END_TIME < #{endTime}
			and a.STAFF_ID = #{suId} ]]>
			and a.STATE !='预约取消'
			and a.STATE !='待确认'
			and a.STATE !='待预约'
			order by a.BEGIN_TIME asc

			</select>
			@@ -407,6 +414,7 @@
			<select id="selectItemDetail" resultType="java.util.HashMap" parameterType="java.util.HashMap">
			select
			f.SHOP_NAME,
			b.yy_time,
			b.consume_time,
			b.SERVICE_NO,
			d.su_name,
			@@ -417,7 +425,8 @@
			a.COUNT,
			h.PRICE,
			h.SOURCE,
			a.STATE
			a.STATE,
			a.extract
			from sys_beautician_state a
			left join sys_proj_services b on a.SERVICES_ID=b.ID
			left join shopping_goods c on a.proj_id=c.id
			@@ -455,7 +464,7 @@
			</if>

			<if test="cateId != null and cateId != '' ">
			and c.PROJ_TYPE_ID=#{cateId}
			and c.cate_id=#{cateId}
			</if>


			@@ -616,7 +625,7 @@

			<select id="selectByProjUse" resultMap="SysBeauticianStateMap">
			select * from sys_beautician_state
			where state!=#{state} puse_id in
			where state!=#{state} and puse_id in
			<foreach collection="list" index="index" item="item" open="("
			separator="," close=")">
			#{item.id}
			@@ -625,6 +634,6 @@

			<select id="selectBeauticianStateByPuseIdAndNoStatus" resultMap="SysBeauticianStateMap">
			select * from sys_beautician_state
			where puse_id=#{puseId} ans state!=#{state}
			where puse_id=#{puseId} and state!=#{state}
			</select>
			</mapper>