Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

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

@@ -1,6 +1,7 @@
package com.dg.core.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dg.core.ResultData;
import com.dg.core.db.gen.entity.*;
import org.springframework.data.repository.query.Param;

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

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


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


    /**
     * 很具用户id查询是否有对应工单
     * @return
     */
    int countUser(String userId,String state);

    /**
     * 根据进展类修改用户代办数量
@@ -60,9 +77,17 @@
     * 统计工单用  1 今天   2昨天   3本月   4本年度 String time
     * @return
     */
    int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,String evaluateState,List<String> classifyIds);
    int countStatisticsNum(String state,List<String> ids,String time,String isTimeout,
                           String evaluateState,List<String> classifyIds,
                           String serviceState,String guideUserId);


    /**
     * 统计数据
     * @param state
     * @param ids
     * @param time
     * @return
     */
    List<CountListNum> countListNum(String state,
                                    List<String> ids,
                                    Integer time);
@@ -73,4 +98,37 @@
     */
    SysUser getSubmitUser(GuideRepairOrder guideRepairOrder);


    /**
     * 设置超时时间
     * @return
     */
    GuideRepairOrder setTimeoutTim(GuideRepairOrder guideRepairOrder);


    /**
     * 导办人员有新订单推送消息
     * @return
     */
    void  sendGuideRepairOrderSubmit (String openid,GuideRepairOrder guideRepairOrder);

    /**
     * 删除工单
     * @param Id
     * @return
     */
    int deleteConfigById(String Id);

    /**
     * 推送超时工单
     * @return
     */
    ResultData pushOvertimeGuideRepairOrder();

    /**
     * 更改状态为好评
     * @return
     */
    int updateEvaluate();

}