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

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventVisitingTasksMapper.java

@@ -8,7 +8,7 @@
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.visit.AppVisitTasksVO;
import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.visit.EventVisitListVO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
@@ -42,6 +42,14 @@
     * @return
     */
    IPage<EventVisitingTasksVO> findListByPage(Page page, @Param("query")EventTasksQuery query);

    /**
     * appc查看走访任务
     * @param page
     * @param query
     * @return
     */
    IPage<EventVisitingTasksVO> appFindListByPage(Page page, @Param("query")EventTasksQuery query);

    /**
     * 查询走访记录，任务
@@ -84,10 +92,10 @@

    /**
     * 完成走访
     * @param taskCompleteDTO
     * @param complete
     * @return
     */
    Integer complete(EventVisitCompleteDTO taskCompleteDTO);
    Integer complete(EventVisitingTasksDO complete);

    Integer start(EventVisitingTasksDO start);

@@ -95,5 +103,6 @@

    Map<String, Object> findUserById(Long userId);

    String getLabel(Long id);
    String getPopulationLabel(@Param("populationId") Long populationId);

}