Merge branch 'feature/REQ-1634' into 'dev'
+参数修改 See merge request universal/infrastructure/backend/msg-center-plat!83
This commit is contained in:
commit
bc9d594969
@ -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());
|
||||||
|
|||||||
@ -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;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user