Merge branch 'api' into order_reform

wzy

2021-01-13 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994

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

@@ -464,11 +464,14 @@
      <result property="time" column="time"/>
      <result property="bed" column="bed" />
      <result property="vipName" column="vipName" />
      <result property="vipId" column="vipId" />
      <result property="timeLength" column="timeLength" />
      <result property="status" column="status" />
      <result property="createStaffId" column="createStaffId" />
      <collection property="projs" ofType="com.matrix.system.app.vo.ServiceOrderListProjVo">
         <result property="projName" column="projName" />
         <result property="beautyName" column="beautyName" />
         <result property="id" column="staffId" />
      </collection>
   </resultMap>

@@ -480,8 +483,11 @@
         a.YY_TIME time,
         a.TOTAL_TIME timeLength,
         a.state status,
         a.create_staff_id createStaffId,
         d.BED_NAME bed,
         e.VIP_NAME vipName,
         e.id vipId,
         b.staff_id staffId,
         f.su_name beautyName,
         g.proj_name projName
      from sys_proj_services a
@@ -500,6 +506,9 @@
         </if>
         <if test="record.shopId != null">
            and a.shop_id=#{record.shopId}
         </if>
         <if test="record.userId!=null">
            and (a.create_staff_id=#{record.userId} or b.staff_id=#{record.userId})
         </if>
      </where>
      <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
@@ -530,6 +539,9 @@
         <if test="record.shopId != null">
            and a.shop_id=#{record.shopId}
         </if>
         <if test="record.userId!=null">
            and (a.create_staff_id=#{record.userId} or b.staff_id=#{record.userId})
         </if>
      </where>
   </select>
</mapper>