Merge branch 'pre'

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -176,10 +176,10 @@ public class ScheduleController {
         int weeks = (int) Math.ceil((double) days / 7);
         if (dto.getWeek() == null) {
             for (int i = 0; i < weeks; i++) {
-                LocalDateTime startDate = startDateTime.plusDays(i * 6).withHour(0).withMinute(0).withSecond(0).withNano(0);
-                LocalDateTime endDate = startDateTime.plusDays((i + 1) * 6).withHour(23).withMinute(59).withSecond(59).withNano(9999);
+                LocalDateTime startDate = startDateTime.plusDays(i * 7).withHour(0).withMinute(0).withSecond(0).withNano(0);
+                LocalDateTime endDate = startDate.plusDays(6).withHour(23).withMinute(59).withSecond(59).withNano(9999);
                 if (now.isAfter(startDate) && now.isBefore(endDate)) {
-                    return RT.ok(i);
+                    return RT.ok(i + 1);
                 }
             }
         }

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

@@ -145,6 +145,7 @@ public class TeacherAwardController {
                     .like(dto.getApplicantUserIdCn() != null && !dto.getApplicantUserIdCn().equals(""), XjrUser::getName, dto.getApplicantUserIdCn())
                     .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()))
                     .orderByDesc(TeacherAward::getCreateDate)
             ;
             List<TeacherAwardDetailPageVo> list = teacherAwardService.selectJoinList(TeacherAwardDetailPageVo.class, teacherAwardMPJLambdaWrapper);

src/main/java/com/xjrsoft/module/teacher/vo/TeacherAwardDetailExcelVo.java

@@ -56,7 +56,7 @@ public class TeacherAwardDetailExcelVo {
     @ApiModelProperty("发表时间")
     private String issueDate;
 
-    @ExcelProperty("备注")
+    @ExcelProperty("主办单位")
     @ApiModelProperty("备注")
     private String remark;