Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java

@@ -50,15 +50,32 @@
     * @param matterName
     * @return
     */
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,@Param("matterName") String matterName,
                                            @Param("ids") List<String> ids);
    List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
                                            @Param("matterName") String matterName,
                                            @Param("ids") List<String> ids,
                                            @Param("status") String status,
                                            @Param("guideUserId") String guideUserId);


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

    /**
     * 获取工单列表(求和)
     * @param matterName
     * @return
     */
    int countConfigList(@Param("matterName") String matterName,@Param("ids") List<String> ids);
    int countConfigList(@Param("matterName") String matterName,
                        @Param("ids") List<String> ids,
                        @Param("status") String status,
                        @Param("guideUserId") String guideUserId);


    /**
@@ -84,7 +101,9 @@
                           @Param("time") String time,
                           @Param("isTimeout") String isTimeout,
                           @Param("evaluateState") String evaluateState,
                           @Param("classifyIds") List<String> classifyIds);
                           @Param("classifyIds") List<String> classifyIds,
                           @Param("serviceState") String serviceState,
                           @Param("guideUserId") String guideUserId);

    /**
     * 统计工单用
@@ -93,6 +112,17 @@
    List<CountListNum> countListNum(@Param("state") String state,
                                    @Param("ids") List<String> ids,
                                    @Param("time") Integer time);
    /**
     * 获取超时工单
     * @return
     */
   List<GuideRepairOrder> selectOvertime();

    /**
     * 更改状态为好评
     * @return
     */
    List<GuideRepairOrder> selectEvaluate();


}