Merge branch 'test' into 'master'

罗元桥

2021-06-30 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c

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

@@ -187,7 +187,6 @@
            if(!StringUtils.isEmpty(error)){
                rt.append(rt);
            }
            eventVisitingTasksMapper.deleteById(Long.valueOf(id));
        }
        if(!StringUtils.isEmpty(rt)){
            return R.fail("部分删除失败:"+rt.toString());
@@ -203,6 +202,7 @@
        if(!Objects.equals(eventVisitingTasksDO.getEventStatus(),EventTasksStatusEnum.DZF.getCode())){
            return "["+eventVisitingTasksDO.getVisiterName()+"]状态不可删除;";
        }
        eventVisitingTasksMapper.deleteById(Long.valueOf(id));
        return null;
    }

@@ -210,7 +210,7 @@
    public R visitorList(EventVisitListQuery query) {
        IPage<EventVisitListVO> page = eventVisitingTasksMapper.visitorList(new Page(query.getPageNum(),query.getPageSize()),query);
        page.getRecords().stream().forEach(e->{
            List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id"));
            List<EventVisitingTasksDO> list = eventVisitingTasksMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().eq("visiter_id",e.getId()).orderByDesc("id").last("limit 0,1"));
            if(!CollectionUtils.isEmpty(list)){
                e.setCreateAt(list.get(0).getCreateAt());
                e.setEventStatus(list.get(0).getEventStatus());
@@ -354,13 +354,13 @@

    @Transactional(rollbackFor = Exception.class)
    @Override
    public R cancel(Long id) {
    public R cancel(IdDTO idDTO) {

        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.DZF.getCode()){
            return R.fail("当前状态不可撤销");
        }
        int rt = eventVisitingTasksMapper.cancel(id,EventTasksStatusEnum.YCX.getCode());
        int rt = eventVisitingTasksMapper.cancel(eventVisitingTasksDO.getId(),EventTasksStatusEnum.YCX.getCode());
        if(rt > 0){
            return R.ok();
        }
@@ -369,13 +369,13 @@

    @Transactional(rollbackFor = Exception.class)
    @Override
    public R reset(Long id) {
    public R reset(IdDTO idDTO) {

        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(id);
        EventVisitingTasksDO eventVisitingTasksDO = eventVisitingTasksMapper.selectById(Long.valueOf(idDTO.getId()));
        if(eventVisitingTasksDO == null || eventVisitingTasksDO.getEventStatus() != EventTasksStatusEnum.YCX.getCode()){
            return R.fail("当前状态不可恢复");
        }
        int rt = eventVisitingTasksMapper.updateEventStatus(id,EventTasksStatusEnum.DZF.getCode());
        int rt = eventVisitingTasksMapper.updateEventStatus(eventVisitingTasksDO.getId(),EventTasksStatusEnum.DZF.getCode());
        if(rt > 0){
            return R.ok();
        }