beauty-erp.git - Gitblit

			@@ -131,15 +131,15 @@
			a.count,
			a.proj_id,
			b.su_name,
			c.name as goods_name,
			c.seal_pice as goods_seal_pice,
			d.proj_name as goods_name,
			d.price as goods_seal_pice,
			c.TIME_LENGTH as goods_time_length,
			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>

			@@ -329,6 +333,7 @@
			and a.STAFF_ID = #{suId} ]]>
			and a.STATE !='预约取消'
			and a.STATE !='待确认'
			and a.STATE !='服务单结束'
			and a.STATE !='待预约'
			order by a.BEGIN_TIME asc