k94314517
2024-07-05 e992f6c13602feadd60f9df16c65ffccc1cdcb6a
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
@@ -158,10 +158,12 @@
        if(noticesDTO.getQueryType().equals(Constants.ZERO)){
            queryWrapper.eq(Notices::getStatus,Constants.ZERO);
            queryWrapper.eq(Notices::getSendacopy,Constants.ZERO);
            queryWrapper.eq(Notices::getParam2,Constants.ZERO);
            queryWrapper.eq(Notices::getUserId, noticesDTO.getMemberId());
        } else if(noticesDTO.getQueryType().equals(Constants.ONE)){
            queryWrapper.eq(Notices::getStatus,Constants.ONE);
            queryWrapper.eq(Notices::getSendacopy,Constants.ZERO);
            queryWrapper.eq(Notices::getParam4,noticesDTO.getMemberId());
        } else if(noticesDTO.getQueryType().equals(Constants.TWO)){
            queryWrapper.eq(Notices::getParam3, noticesDTO.getMemberId());
        } else if (noticesDTO.getQueryType().equals(Constants.THREE)) {
@@ -174,13 +176,16 @@
            queryWrapper.eq("1","2");
        }
        queryWrapper.ge(noticesDTO.getStartDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getStartDate() ));
        queryWrapper.le(noticesDTO.getStartDate() != null,  Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getStartDate() ));
        queryWrapper.ge(noticesDTO.getEndDate() != null, Notices::getCreateDate, Utils.Date.getStart(noticesDTO.getEndDate() ));
        queryWrapper.le(noticesDTO.getEndDate() != null,  Notices::getCreateDate, Utils.Date.getEnd(noticesDTO.getEndDate() ));
        queryWrapper.eq(Objects.nonNull(noticesDTO.getType()),Notices::getType,noticesDTO.getType());
        queryWrapper.eq(StringUtils.isNotBlank(noticesDTO.getTitle()),Notices::getTitle,noticesDTO.getTitle());
        queryWrapper.orderByDesc(Notices::getCreateDate);
        PageData<Notices> pageData = PageData.from(noticesMapper.selectJoinPage(page,Notices.class, queryWrapper));
        if(noticesDTO.getQueryType().equals(Constants.ZERO)){
            for (Notices notices:pageData.getRecords()) {
                notices.setInfo("待我处理");
            }
        }
        return pageData;
    }
@@ -201,7 +206,7 @@
        if(Constants.equalsInteger(notices.getSendacopy(),Constants.ONE)){
            if(Constants.equalsInteger(Constants.ZERO,notices.getReaded())){
                noticesMapper.update(null,new UpdateWrapper<Notices>().lambda()
                        .set(Notices::getReaded,Constants.ONE).eq(Notices::getId,notices));
                        .set(Notices::getReaded,Constants.ONE).eq(Notices::getId,noticesId));
            }
        }else{
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非抄送数据,无法进行标记");