走访任务

xyh

2021-06-24 8c1ad63332a511455c65fb84d8e930f57934198a

走访任务

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1046,7 +1046,7 @@
     * @return
     */
    @PostMapping("/eventvisitingtasks/start")
    R start(@RequestParam("id")Long id);
    R start(@RequestParam("id")Long id,@RequestParam("userId")Long userId);

    /**
     * 完成走访记录

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

@@ -53,7 +53,7 @@
    @ApiOperation(value = "开始走访-xyh")
    @PostMapping("/start")
    public R start(@RequestParam("id") Long id){
        return gridService.start(id);
        return gridService.start(id,this.getUserId());
    }

    @ApiOperation(value = "完成走访记录-xyh")

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

@@ -174,8 +174,8 @@
     * @return
     */
    @PostMapping("/start")
    R start(@RequestParam("id")Long id){
        return eventVisitingTasksService.start(id);
    R start(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
        return eventVisitingTasksService.start(id,userId);
    }

    /**

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

@@ -89,7 +89,9 @@
     */
    Integer complete(EventVisitCompleteDTO taskCompleteDTO);

    Integer start(@Param("id")Long id,@Param("status") Integer status);
    Integer start(EventVisitingTasksDO start);

    Integer cancel(@Param("id")Long id,@Param("status") Integer status);

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

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java

@@ -141,7 +141,7 @@
     * @param id
     * @return
     */
    R start(Long id);
    R start(Long id,Long userId);

    /**
     * 完成

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java

@@ -224,11 +224,11 @@
            return ;
        }
        EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
        visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
        visitingTasksDO.setGridMemberCommunity(communityId);
        visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
        visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
        visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
//        visitingTasksDO.setGridMemberStreet(Long.valueOf(gridMap.get("street_id").toString()));
//        visitingTasksDO.setGridMemberCommunity(communityId);
//        visitingTasksDO.setGridMember(Long.valueOf(gridMap.get("user_id").toString()));
//        visitingTasksDO.setGridMemberName(gridMap.get("name").toString());
//        visitingTasksDO.setGridMenberTele(gridMap.get("phone") ==null?"":gridMap.get("phone").toString());
        visitingTasksDO.setVisiterId(Long.valueOf(map.get("id").toString()));
        visitingTasksDO.setVisiterName(map.get("name").toString());
        visitingTasksDO.setVisiterSex(Integer.valueOf(map.get("sex").toString()));
@@ -280,13 +280,23 @@
        return R.fail();
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public R start(Long id) {
    public synchronized R start(Long id,Long userId) {
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
            return R.fail("当前状态不可开始走访");
        }
        int rt = eventVisitingTasksMapper.start(id,EventTasksStatusEnum.JXZ.getCode());
        Map<String,Object> map = eventVisitingTasksMapper.findUserById(userId);
        EventVisitingTasksDO start = new EventVisitingTasksDO();
        start.setId(id);
        start.setGridMemberStreet(Long.valueOf(map.get("street_id").toString()));
        start.setGridMemberCommunity(Long.valueOf(map.get("community_id").toString()));
        start.setGridMember(Long.valueOf(map.get("user_id").toString()));
        start.setGridMemberName(map.get("name").toString());
        start.setGridMenberTele(map.get("phone") ==null?"":map.get("phone").toString());
        start.setEventStatus(EventTasksStatusEnum.JXZ.getCode());
        int rt = eventVisitingTasksMapper.start(start);
        if(rt > 0){
            return R.ok();
        }

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

@@ -130,6 +130,12 @@
        WHERE u.community_id = #{communityId} and u.type = #{type} limit 1
    </select>

    <select id="findUserByCommunityId" resultType="java.util.Map">
        SELECT u.user_id,u.name,u.phone,u.community_id,a.street_id, FROM sys_user u
        LEFT JOIN com_act a ON u.community_id = a.community_id
        WHERE u.id = #{id}
    </select>

    <select id="findPopulationById" resultType="java.util.Map">
        SELECT p.id,p.name,p.sex,p.phone,p.road,p.door_no,p.floor,p.unit_no,p.house_no,v.address,v.lng,v.lat FROM com_mng_population p
        LEFT JOIN com_mng_village v ON p.village_id = v.village_id WHERE p.id = #{id}
@@ -144,7 +150,9 @@
    </update>

    <update id="start">
        update event_visiting_tasks set event_status = #{status},dell_user_id = grid_member ,dell_user_name =grid_member_name, dell_type = 1,dell_date = NOW() where id = #{id}
        update event_visiting_tasks set event_status = #{eventStatus},
        grid_member_street = #{gridMemberStreet},grid_member_community=#{gridMemberCommunity},grid_member=#{gridMember},grid_member_name=#{gridMemberName},grid_menber_tele=#{gridMenberTele}
        dell_user_id = #{gridMember} ,dell_user_name =#{gridMemberName}, dell_type = 1,dell_date = NOW() where id = #{id}
    </update>

    <update id="cancel">