~jiangyouyao/beauty-erp.git

			@@ -5,7 +5,12 @@
			<mapper namespace="com.matrix.system.hive.dao.SysProjUseDao">

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

			<id property="id" column="ID"/>
			<result property="createBy" column="create_by" />
			<result property="createTime" column="create_time" />
			<result property="updateBy" column="update_by" />
			<result property="updateTime" column="update_time" />
			<result property="orderItemId" column="ORDER_ITEM_ID"/>
			<result property="projId" column="PROJ_ID"/>
			<result property="surplusCount" column="SURPLUS_COUNT"/>
			@@ -26,17 +31,116 @@
			<result property="deductionNum" column="deductionNum"/>
			<result property="isCourse" column="is_course"/>
			<result property="timeLength" column="time_length"/>




			<result property="orderId" column="orderId"/>
			<!-- 对应项目信息-->
			<association property="projInfo" javaType="ShoppingGoods"
			resultMap="com.matrix.system.hive.dao.ShoppingGoodsDao.ShoppingGoodsMap"/>

			</resultMap>

			<!-- 余次使用记录map -->
			<resultMap type="com.matrix.system.hive.bean.SysProjUseFlow" id="SysProjUseFlowMap">
			<id property="id" column="id"/>
			<result property="createBy" column="create_by" />
			<result property="createTime" column="create_time" />
			<result property="updateBy" column="update_by" />
			<result property="updateTime" column="update_time" />
			<result property="projUseId" column="proj_use_id"/>
			<result property="surplusCount" column="surplus_count"/>
			<result property="isOver" column="is_over"/>
			<result property="failTime" column="fail_time"/>
			<result property="price" column="price"/>
			<result property="status" column="status"/>
			<result property="balance" column="balance"/>
			<result property="remark" column="remark"/>
			<result property="projName" column="proj_name"/>
			<result property="optionType" column="option_type"/>
			</resultMap>

			<!-- 插入流水 -->
			<insert id="insertFlow" parameterType="SysProjUse" useGeneratedKeys="true"
			keyProperty="id">
			INSERT INTO sys_proj_use_flow (
			create_by,
			create_time,
			update_by,
			update_time,
			id,
			proj_use_id,
			surplus_count,
			is_over,
			fail_time,
			price,
			status,
			balance,
			remark,
			proj_name,
			option_type
			)
			VALUES (
			#{createBy},
			now(),
			#{updateBy},
			now(),
			#{id},
			#{projUseId},
			#{surplusCount},
			#{isOver},
			#{failTime},
			#{price},
			#{status},
			#{balance},
			#{remark},
			#{projName},
			#{optionType}
			)
			</insert>

			<!-- 查询流水 -->
			<select id="selectProjUseFlow" resultMap="SysProjUseFlowMap">
			select * from sys_proj_use_flow
			<where>
			and proj_use_id=#{record.projUseId}
			<if test="record.createBy !=null and record.createBy!='' ">
			and instr(createBy,#{record.createBy})
			</if>
			<if test="record.beginTime !=null and record.beginTime!=''">
			and create_time >= #{record.beginTime}
			</if>
			<if test="record.endTime !=null and record.endTime!=''">
			<![CDATA[ and create_time <= #{record.endTime} ]]>
			</if>

			</where>
			<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
			<if test="pageVo.sort !=null and pageVo.order !=null">
			order by
			${pageVo.sort} ${pageVo.order}
			</if>
			<if test="pageVo.offset >=0 and pageVo.limit >0">
			limit
			#{pageVo.offset},#{pageVo.limit}
			</if>
			</if>

			</select>

			<select id="selectProjUseFlowTotal" resultType="java.lang.Integer">
			select count(*) from sys_proj_use_flow
			<where>
			and proj_use_id=#{record.projUseId}
			<if test="record.createBy !=null and record.createBy!='' ">
			and instr(createBy,#{record.createBy})
			</if>
			<if test="record.beginTime !=null and record.beginTime!=''">
			and create_time >= #{record.beginTime}
			</if>
			<if test="record.endTime !=null and record.endTime!=''">
			<![CDATA[ and create_time <= #{record.endTime} ]]>
			</if>

			</where>
			</select>

			<!-- 插入方法 -->
			<insert id="insert" parameterType="SysProjUse" useGeneratedKeys="true"
			@@ -228,14 +332,20 @@
			<select id="selectInPage" resultMap="SysProjUseMap">
			select
			a.*,
			d.id as orderId,
			b.TIME_LENGTH,
			b.img
			from sys_proj_use a
			left join shopping_goods b on a.proj_id=b.id
			left join sys_order_item c on a.ORDER_ITEM_ID=c.id
			left join sys_order d on c.ORDER_ID=d.id
			where 1=1
			<if test="record!=null">
			<if test="record.id != null and record.id !='' ">
			and a.ID = #{record.id}
			</if>
			<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}))
			</if>
			<if test="record.orderItemId != null and record.orderItemId !='' ">
			and a.ORDER_ITEM_ID = #{record.orderItemId}
			@@ -268,7 +378,9 @@
			<if test="record.failTime != null ">
			and a.FAIL_TIME = #{record.failTime}
			</if>

			<if test="record.targetFailTime != null ">
			and date_format(#{record.targetFailTime}, '%Y-%m-%d') > date_format(a.FAIL_TIME, '%Y-%m-%d')
			</if>
			<if test="record.price != null and record.price !='' ">
			and a.PRICE = #{record.price}
			</if>
			@@ -332,80 +444,94 @@
			<!-- 查询总条数 -->
			<select id="selectTotalRecord" resultType="java.lang.Integer">
			select count(*)
			from sys_proj_use
			from sys_proj_use a
			left join shopping_goods b on a.proj_id=b.id
			left join sys_order_item c on a.ORDER_ITEM_ID=c.id
			left join sys_order d on c.ORDER_ID=d.id
			where 1=1
			<if test="record!=null">
			<if test="record.id != null and record.id !='' ">
			and ID = #{record.id}
			and a.ID = #{record.id}
			</if>
			<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}))
			</if>
			<if test="record.orderItemId != null and record.orderItemId !='' ">
			and ORDER_ITEM_ID = #{record.orderItemId}
			and a.ORDER_ITEM_ID = #{record.orderItemId}
			</if>
			<if test="record.projId != null and record.projId !='' ">
			and PROJ_ID = #{record.projId}
			and a.PROJ_ID = #{record.projId}
			</if>
			<if test="record.surplusCount != null and record.surplusCount !='' ">
			and SURPLUS_COUNT = #{record.surplusCount}
			and a.SURPLUS_COUNT = #{record.surplusCount}
			</if>
			<if test="record.isOver != null and record.isOver !='' ">
			and IS_OVER = #{record.isOver}
			and a.IS_OVER = #{record.isOver}
			</if>
			<!-- 查询具体某一个套餐的使用情况 -->
			<if
			test="record.taocanId != null and record.taocanId !=-1 and record.taocanId !=-2">
			and TAOCAN_ID = #{record.taocanId}
			and a.TAOCAN_ID = #{record.taocanId}
			</if>
			<!-- 查询所有的项目使用情况 -->
			<if test="record.taocanId != null and record.taocanId ==-1 ">
			and TAOCAN_ID IS NULL
			and a.TAOCAN_ID IS NULL
			</if>
			<!-- 查询所有的套餐使用情况 -->
			<if test="record.taocanId != null and record.taocanId ==-2 ">
			and TAOCAN_ID IS NOT NULL
			and a.TAOCAN_ID IS NOT NULL
			</if>
			<if test="record.vipId != null and record.vipId !='' ">
			and VIP_ID = #{record.vipId}
			and a.VIP_ID = #{record.vipId}
			</if>
			<if test="record.failTime != null ">
			and a.FAIL_TIME = #{record.failTime}
			</if>
			<if test="record.targetFailTime != null ">
			and date_format(#{record.targetFailTime}, '%Y-%m-%d') > date_format(a.FAIL_TIME, '%Y-%m-%d')
			</if>
			<if test="record.price != null and record.price !='' ">
			and PRICE = #{record.price}
			and a.PRICE = #{record.price}
			</if>
			<if test="record.assembleId != null and record.assembleId !='' ">
			and ASSEMBLE_ID = #{record.assembleId}
			and a.ASSEMBLE_ID = #{record.assembleId}
			</if>
			<if test="record.source != null and record.source !='' ">
			and SOURCE like concat('%',#{record.source},'%')
			and a.SOURCE like concat('%',#{record.source},'%')
			</if>
			<if test="record.status != null and record.status !='' ">
			and STATUS = #{record.status}
			and a.STATUS = #{record.status}
			</if>
			<if test="record.platformFlag != null and record.platformFlag !='' ">
			and PLATFORM_FLAG = #{record.platformFlag}
			</if>
			<if test="record.projName != null and record.projName !='' ">
			and PROJ_NAME like concat('%',#{record.projName},'%')
			and a.PLATFORM_FLAG = #{record.platformFlag}
			</if>
			<if test="record.type != null and record.type !='' ">
			and type = #{record.type}
			and a.type = #{record.type}
			</if>
			<if test="record.projName != null and record.projName !='' ">
			and a.PROJ_NAME like concat('%',#{record.projName},'%')
			</if>
			<if test="record.balance != null and record.balance !='' ">
			and balance = #{record.balance}
			and a.balance = #{record.balance}
			</if>
			<if test="record.remark != null and record.remark !='' ">
			and remark = #{record.remark}
			and a.remark = #{record.remark}
			</if>

			<if test="record.isCourse != null and record.isCourse !='' ">
			and is_course = #{record.isCourse},
			and a.is_course = #{record.isCourse},
			</if>
			</if>
			</select>

			<!-- 根据id查询 -->
			<select id="selectById" resultMap="SysProjUseMap">
			select *
			from sys_proj_use
			select a.*,
			b.TIME_LENGTH,
			b.img
			from sys_proj_use a
			left join shopping_goods b on a.proj_id=b.id
			where
			id=#{id}
			a.id=#{id}
			</select>

			<!-- 根据id查询 -->
			@@ -424,8 +550,11 @@
			<!-- 根据对象查询 -->
			<select id="selectByModel" resultMap="SysProjUseMap">
			select
			a.*
			a.*,
			b.time_length,
			b.img
			from sys_proj_use a
			left join shopping_goods b on a.proj_id=b.id
			where 1=1
			<if test="record!=null">
			<if test="record.id != null and record.id !='' ">
			@@ -628,7 +757,7 @@
			and a.proj_name like concat('%',#{projName},'%')
			</if>
			<if test="cateId != null and cateId != '' ">
			and b.PROJ_TYPE_ID=#{cateId}
			and b.cate_id=#{cateId}
			</if>
			</where>

			@@ -724,4 +853,10 @@
			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>


			</mapper>