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

xyh

2021-06-28 7d16a1da2ab2bfdabf247af19b516a84a459bb32

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java

@@ -7,9 +7,11 @@
import com.panzhihua.common.model.query.visit.EventTasksQuery;
import com.panzhihua.common.model.query.visit.EventVisitListQuery;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.grid.EventDetailsVO;
import com.panzhihua.common.model.vos.visit.EventVisitCompleteDTO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksDetailsVO;
import com.panzhihua.common.model.vos.visit.EventVisitingTasksVO;
import com.panzhihua.service_grid.model.dos.EventVisitingTasksDO;
import com.panzhihua.service_grid.service.EventVisitingTasksService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -117,17 +119,6 @@
        return eventVisitingTasksService.list(query);
    }


    /**
     * app走访任务
     * @param query
     * @return
     */
    @PostMapping("/eventvisitingtasks/appTaskList")
    R appTaskList(@RequestBody EventTasksQuery query) throws Exception {
        return eventVisitingTasksService.appTaskList(query);
    }

    /**
     * 走访任务列表
     * @param query
@@ -198,4 +189,30 @@
    R complete(@RequestBody EventVisitCompleteDTO taskCompleteDTO){
        return eventVisitingTasksService.complete(taskCompleteDTO);
    }


    /**
     * description 获取所有未上传到浪潮平台的走访事件列表
     *
     * @return String 事件列表
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @GetMapping("/getUnUploadVisitingTask")
    List<LcEventVisitingTasksListDTO> getUnUploadVisitingTask() {
        return eventVisitingTasksService.getUnUploadVisitingTask();
    }

    /**
     * description 更新走访任务上传是否成功标识
     *
     * @param id 事件主键ID
     * @return Boolean 上传是否成功
     * @author manailin
     * @date 2021/6/10 17:00
     */
    @PostMapping("/updateLcUploadFlagVisitingTask")
    Boolean updateLcUploadFlagVisitingTask(@RequestParam("id") Long id) {
        return eventVisitingTasksService.updateLcUploadFlagVisitingTask(id);
    }
}