通知公告增加创建时间查询

src/main/java/com/xjrsoft/module/oa/dto/ProclamationPageDto.java

@@ -4,9 +4,12 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 /**
  *
@@ -36,4 +39,13 @@ public class ProclamationPageDto extends PageInput {
      */
     @ApiModelProperty(value = "当前用户id", hidden = true)
     private Long loginId;
+
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建日期-开始")
+    private LocalDateTime createDateStart;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("创建日期-结束")
+    private LocalDateTime createDateEnd;
 }

src/main/java/com/xjrsoft/module/oa/entity/News.java

@@ -126,4 +126,10 @@ public class News extends AuditEntity implements Serializable {
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "newsId")
     private List<NewsAppendix> appendixList;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty("创建人id")
+    private Long createUserId;
 }

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -64,6 +64,7 @@ import com.xjrsoft.module.organization.service.IWeChatService;
 import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.mapper.BaseStudentSchoolRollMapper;
 import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.teacher.entity.TeacherAward;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
 import lombok.AllArgsConstructor;
@@ -268,12 +269,15 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         queryNews
                 .select(News::getId)
                 .selectAs(Department::getName, ProclamationPageVo::getSendDeptIdCN)
+                .selectAs(User::getName, ProclamationPageVo::getCreateUserName)
                 .select(News.class, x -> VoToColumnUtil.fieldsToColumns(ProclamationPageVo.class).contains(x.getProperty()))
                 .leftJoin(Department.class, Department::getId, News::getSendDeptId)
+                .leftJoin(User.class, User::getId, News::getCreateUserId)
                 .eq(!StpUtil.getRoleList().contains("GongGao"), News::getCreateUserId, StpUtil.getLoginIdAsLong())
                 .eq(News::getTypeId, 2)
                 .like(dto.getFullHead() != null, News::getFullHead, dto.getFullHead())
                 .like(dto.getKeyword() != null, News::getNewsContent, dto.getKeyword())
+                .between((ObjectUtil.isNotNull(dto.getCreateDateStart()) && ObjectUtil.isNotNull(dto.getCreateDateEnd())), News::getCreateDate, dto.getCreateDateStart(), dto.getCreateDateEnd())
                 .orderByDesc(News::getId)
                 .disableSubLogicDel();
         IPage<ProclamationPageVo> page = this.selectJoinListPage(ConventPage.getPage(dto), ProclamationPageVo.class, queryNews);

src/main/java/com/xjrsoft/module/oa/vo/ProclamationPageVo.java

@@ -82,4 +82,11 @@ public class ProclamationPageVo {
      */
     @ApiModelProperty("状态 1=未发布 2=已发布 3=下架")
     private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createDate;
+
+
+    @ApiModelProperty("创建人姓名")
+    private String createUserName;
 }

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

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