Merge branch 'score_shop'

wzy

2022-10-09 99091a8cbb8e098575c75a7c640b568addbcc29d

 zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java

@@ -62,6 +62,8 @@
     */
    public SysProjServices findById(Long id);

    public List<SysProjServices> findByIds(List<Long> id);

    /**
     * 排班
     */
@@ -74,6 +76,8 @@

    /**
     * 删除服务单中明细， 即项目/套餐
     * @param id
     * @return
     */
    public int deleteProjServiceItemById(Long id);

@@ -109,4 +113,13 @@
    List<ServiceOrderListVo> findApiServiceOrderListInPage(ServiceOrderListDto serviceOrderListDto, PaginationVO pageVo);

    int findApiServiceOrderListTotal(ServiceOrderListDto serviceOrderListDto);

    public boolean skipServiceOrderStep(String step);

    /**
     * 确认服务单
     * @param id
     * @return
     */
    int confirmServiceOrder(Long id);
}