From a2746876e81443d52bc4cb6f35bf8554741a6b4c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 18 十月 2024 14:28:33 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
index 68ab7e8..72df53c 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/NoticesServiceImpl.java
+++ b/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,17 @@
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(Objects.nonNull(noticesDTO.getMemberId()),Notices::getUserId,noticesDTO.getMemberId());
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;
}
@@ -198,14 +204,15 @@
if(Objects.isNull(notices)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- 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));
- }
- }else{
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴妱閫佹暟鎹�,鏃犳硶杩涜鏍囪");
+ if(Constants.equalsInteger(Constants.ZERO,notices.getReaded())){
+ noticesMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getReaded,Constants.ONE).eq(Notices::getId,noticesId));
}
+// if(Constants.equalsInteger(notices.getSendacopy(),Constants.ONE)){
+//
+// }else{
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炴妱閫佹暟鎹�,鏃犳硶杩涜鏍囪");
+// }
}
/**
--
Gitblit v1.9.3