修改bug以及综治后台网格员与网格接口改动

huanghongfa

2021-07-08 0cbf7ed7772684e7ea4f6f957dc0d6d6379acee3

修改bug以及综治后台网格员与网格接口改动

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

@@ -231,8 +231,10 @@
        if(eventVisitingTasksDO!=null) {
            EventVisitingTasksDetailsVO eventVisitingTasksDetailsVO = new EventVisitingTasksDetailsVO();
            BeanUtils.copyProperties(eventVisitingTasksDO, eventVisitingTasksDetailsVO);
            eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
            eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
            if(StringUtils.isNotEmpty(eventVisitingTasksDO.getVisiterTele())){
                eventVisitingTasksDetailsVO.setVisiterPhone(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
                eventVisitingTasksDetailsVO.setVisiterTele(AESUtil.decrypt128(eventVisitingTasksDO.getVisiterTele(),aesKey));
            }
            JSONObject jsonObject = JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson());
            eventVisitingTasksDetailsVO.setTableContentJson(JSONObject.parseObject(eventVisitingTasksDO.getTableContentJson()));
            if(jsonObject != null && jsonObject.get("check") != null){

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

@@ -100,10 +100,10 @@
            and u.user_id = #{query.userId}
        </if>
        <if test = "query.status == 1">
            and (vt.event_status = 1 or vt.event_status = 6)
            and (vt.event_status = 1 or vt.event_status = 3)
        </if>
        <if test = "query.status == 2">
            and (vt.event_status = 3 or vt.event_status = 7)
            and vt.event_status = 2
        </if>
        <if test = "query.status == 0">
            and (vt.event_status = 1 or vt.event_status = 3 or vt.event_status = 6 or vt.event_status = 6)