Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

 zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml

@@ -327,6 +327,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>
@@ -355,9 +358,9 @@
         SERVICES_ID,
         EXC_TIME,
         extract,
         a.puse_id,
         a.count,
         a.proj_id
         puse_id,
         count,
         proj_id
   </sql>
    <sql id="from">
      from sys_beautician_state 
@@ -455,7 +458,7 @@
            </if>

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


@@ -614,4 +617,17 @@
        group by c.id,f.id) t
    </select>

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

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