Merge branch 'feature/REQ-1634' into 'dev'

+参数修改

See merge request universal/infrastructure/backend/msg-center-plat!83
This commit is contained in:
邬宇 2023-11-27 08:42:50 +00:00
commit bc9d594969
2 changed files with 1 additions and 2 deletions

View File

@ -193,7 +193,7 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
buildTerminalInfo(request); buildTerminalInfo(request);
List<PendingMessageResponse> result = new ArrayList<>(); List<PendingMessageResponse> result = new ArrayList<>();
PendingCalendarCodeDTO calendarCodeDTO = buildCalendarCodesDTO(calendarCodeConfig); PendingCalendarCodeDTO calendarCodeDTO = buildCalendarCodesDTO(calendarCodeConfig);
Long selectDate = request.getSelectDate(); Long selectDate = request1.getSelectDate();
Date date = new Date(selectDate); Date date = new Date(selectDate);
List<PendingMessageRecord> pendingMessageRecords = pendingMessageRecordMapper.queryByTemplateCodes(calendarCodeDTO,null,date,request.getPersonId()); List<PendingMessageRecord> pendingMessageRecords = pendingMessageRecordMapper.queryByTemplateCodes(calendarCodeDTO,null,date,request.getPersonId());
List<MessageTemplateDTO> messageTemplates = messageTemplateNewService.listByTemplateCodes(calendarCodeConfig.getCalendarAllCodes()); List<MessageTemplateDTO> messageTemplates = messageTemplateNewService.listByTemplateCodes(calendarCodeConfig.getCalendarAllCodes());

View File

@ -23,7 +23,6 @@ public class PendingMessageFixedDTO implements Serializable {
/** /**
* 筛选时间 * 筛选时间
*/ */
@NotNull(message = "date is required")
private Long selectDate; private Long selectDate;
private Long personId; private Long personId;