教师获奖统计增加发表日期查询

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

@@ -103,7 +103,8 @@ 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()))
-                .orderByDesc(TeacherAward::getCreateDate)
+                .and((ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())), wq -> wq.between(TeacherAward::getCreateDate, dto.getCreateDateStart(), dto.getCreateDateEnd()).or().between(TeacherAward::getCreateDate, dto.getCreateDateStart(), dto.getCreateDateEnd()))
+                .orderByDesc(TeacherAward::getId)
         ;
         IPage<TeacherAwardDetailPageVo> page = teacherAwardService.selectJoinListPage(ConventPage.getPage(dto), TeacherAwardDetailPageVo.class, teacherAwardMPJLambdaWrapper);
 

src/main/java/com/xjrsoft/module/teacher/dto/TeacherAwardDetailPageDto.java

@@ -46,4 +46,12 @@ public class TeacherAwardDetailPageDto extends PageInput {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("获奖/发表时间-结束")
     private LocalDate issueDateEnd;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("创建日期-开始")
+    private LocalDate createDateStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("创建日期-结束")
+    private LocalDate createDateEnd;
 }

src/main/java/com/xjrsoft/module/teacher/dto/TeacherAwardStatisticsPageDto.java

@@ -37,10 +37,10 @@ public class TeacherAwardStatisticsPageDto extends PageInput {
     private LocalDate awardDateEnd;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty("发表日期-开始")
-    private LocalDate issueDateStart;
+    @ApiModelProperty("创建日期-开始")
+    private LocalDate createDateStart;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty("发表日期-结束")
-    private LocalDate issueDateEnd;
+    @ApiModelProperty("创建日期-结束")
+    private LocalDate createDateEnd;
 }

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

@@ -46,6 +46,10 @@ public class TeacherAwardDetailPageVo {
      */
     @ApiModelProperty("奖项名称")
     private String competitionName;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
     /**
      * 奖项名称
      */

src/main/resources/mapper/teacher/TeacherAwardItemMapper.xml

@@ -13,6 +13,9 @@
         <if test="dto.awardDateStart != null and dto.awardDateEnd != null">
             and a1.award_date between #{dto.awardDateStart} and #{dto.awardDateEnd}
         </if>
+        <if test="dto.createDateStart != null and dto.createDateEnd != null">
+            and a1.create_date between #{dto.createDateStart} and #{dto.createDateEnd}
+        </if>
         AND a3.current_state = 'COMPLETED'
         ) AS score FROM xjr_user t1
         INNER JOIN base_teacher t2 ON t1.id = t2.user_id
@@ -27,8 +30,8 @@
         <if test="dto.awardDateStart != null and dto.awardDateEnd != null">
             and a1.award_date between #{dto.awardDateStart} and #{dto.awardDateEnd}
         </if>
-        <if test="dto.awardDateStart != null and dto.awardDateEnd != null">
-            and a1.award_date between #{dto.awardDateStart} and #{dto.awardDateEnd}
+        <if test="dto.createDateStart != null and dto.createDateEnd != null">
+            and a1.create_date between #{dto.createDateStart} and #{dto.createDateEnd}
         </if>
         AND a3.current_state = 'COMPLETED'
         )  IS NOT NULL