Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -41,7 +41,15 @@
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                            String matterName,List<String> ids,String status);
                                            String matterName,List<String> ids,String status,String guideUserId);

    /**
     * 获取工单列表(不分页用于小程序)
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
                                            String guideUserId);


    /**
@@ -49,7 +57,7 @@
     * @param matterName
     * @return
     */
    int countConfigList(String matterName,List<String> ids,String status);
    int countConfigList(String matterName,List<String> ids,String status,String guideUserId);


    /**
@@ -71,7 +79,7 @@
     */
    int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,
                           String evaluateState,List<String> classifyIds,
                           String serviceState);
                           String serviceState,String guideUserId);

    /**
     * 统计数据