走访任务修改

xyh

2021-06-28 709f9269e3d73816c346388eb5b65c08dc6ae9ea

走访任务修改

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java

@@ -32,14 +32,14 @@
    @ApiOperation(value = "走访记录-xyh", response = AppVisitTasksVO.class)
    @PostMapping("/list")
    public R list(@RequestBody EventTasksQuery query){
        query.setCommunityId(this.getCommunityId());
//        query.setCommunityId(this.getCommunityId());
        return gridService.list(query);
    }

    @ApiOperation(value = "走访任务-xyh", response = AppVisitTasksVO.class)
    @PostMapping("/taskList")
    public R taskList(@RequestBody EventTasksQuery query){
        query.setCommunityId(this.getCommunityId());
//        query.setCommunityId(this.getCommunityId());
        query.setUserId(this.getUserId());
        return gridService.taskList(query);
    }

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

@@ -57,7 +57,7 @@
    @PostMapping("/taskList")
    @ApiOperation(value = "走访任务列表", response= EventVisitingTasksVO.class)
    public R taskList(@RequestBody EventTasksQuery query){
        query.setCommunityId(this.getCommunityId());
//        query.setCommunityId(this.getCommunityId());
        return gridService.taskList(query);
    }

@@ -68,7 +68,7 @@
    @PostMapping("/list")
    @ApiOperation(value = "走访任务记录", response= AppVisitTasksVO.class)
    public R list(@RequestBody EventTasksQuery query){
        query.setCommunityId(this.getCommunityId());
//        query.setCommunityId(this.getCommunityId());
        return gridService.list(query);
    }

@@ -126,7 +126,7 @@
    @PostMapping("/visitorList")
    @ApiOperation(value = "待走访人员列表", response= EventVisitListVO.class)
    public R visitorList(@RequestBody EventVisitListQuery query){
        query.setCommunityId(this.getCommunityId());
//        query.setCommunityId(this.getCommunityId());
        return gridService.visitorList(query);
    }


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

@@ -124,7 +124,7 @@
     * @return
     */
    @PostMapping("/eventvisitingtasks/appTaskList")
    R appTaskList(@RequestBody EventTasksQuery query){
    R appTaskList(@RequestBody EventTasksQuery query) throws Exception {
        return eventVisitingTasksService.appTaskList(query);
    }


 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml

@@ -61,7 +61,10 @@
        TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.card_no_str,p.label,u.name as creator,p.nation_code
        from event_visiting_tasks vt left join com_mng_population p on vt.visiter_id = p.id
        left join sys_user u on vt.create_by = u.user_id
        where p.act_id = #{query.communityId}
        where 1=1
        <if test = "query.communityId != null">
            and p.act_id = #{query.communityId}
        </if>
        <if test = "query.status == 1">
            and (vt.event_status = 3 or vt.event_status = 7)
        </if>
@@ -121,9 +124,6 @@
        FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON vt.visiter_id = p.id WHERE 1=1
        <if test = "query.visiterId !=null">
            and vt.visiter_id = #{query.visiterId}
        </if>
        <if test = "query.communityId !=null">
            and vt.grid_member_community = #{query.communityId}
        </if>
        <if test = "query.status ！= null">
            and vt.event_status = #{eventStatus}