教师获奖登记导出实现上传日期筛选

src/main/java/com/xjrsoft/module/teacher/controller/TeacherAwardController.java

@@ -137,6 +137,12 @@ public class TeacherAwardController {
     @SaCheckPermission("teacheraward:detail")
     public ResponseEntity<byte[]> detailExportQuery(@Valid @RequestBody TeacherAwardDetailPageDto dto){
         try {
+            LocalDateTime createTimeStart = null;
+            LocalDateTime createTimeEnd = null;
+            if(ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())){
+                createTimeStart = dto.getCreateDateStart().atTime(0, 0, 0);
+                createTimeEnd = dto.getCreateDateEnd().atTime(23, 59, 59);
+            }
             MPJLambdaWrapper<TeacherAward> teacherAwardMPJLambdaWrapper = new MPJLambdaWrapper<>();
             teacherAwardMPJLambdaWrapper
                     .disableSubLogicDel()
@@ -153,6 +159,7 @@ public class TeacherAwardController {
                     .like(dto.getWholeCompetitionName() != null && !dto.getWholeCompetitionName().equals(""),TeacherAward::getWholeCompetitionName, dto.getWholeCompetitionName())
                     .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
                     .and((ObjectUtil.isNotNull(dto.getIssueDateStart()) && ObjectUtil.isNotNull(dto.getIssueDateEnd())), wq -> wq.between(TeacherAward::getAwardDate, dto.getIssueDateStart(), dto.getIssueDateEnd()).or().between(TeacherAward::getIssueDate, dto.getIssueDateStart(), dto.getIssueDateEnd()))
+                    .between((ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())),TeacherAward::getCreateDate, createTimeStart, createTimeEnd)
                     .orderByDesc(TeacherAward::getCreateDate)
             ;
             List<TeacherAwardDetailPageVo> list = teacherAwardService.selectJoinList(TeacherAwardDetailPageVo.class, teacherAwardMPJLambdaWrapper);