Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-11 48cf19e7043d7019404d3155f20689df6639bf5b

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -15,7 +15,8 @@
import java.util.List;

@Service
public class GuideRepairOrderServiceImpl extends ServiceImpl<GuideRepairOrderMapper, GuideRepairOrder>  implements IGuideRepairOrderService {
public class GuideRepairOrderServiceImpl extends ServiceImpl<GuideRepairOrderMapper, GuideRepairOrder>
        implements IGuideRepairOrderService {

    @Resource
    private TransactionEventMapper transactionEventMapper;
@@ -188,8 +189,9 @@
     * @return
     */
    @Override
    public int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState) {
        return baseMapper.countStatisticsNum(state,ids,time,isTimeout,evaluateState);
    public int countStatisticsNum(String state,List<String> ids,String time,
                                  String isTimeout,String evaluateState,List<String> classifyIds) {
        return baseMapper.countStatisticsNum(state,ids,time,isTimeout,evaluateState,classifyIds);
    }

    @Override