添加开始以及结束时间字段

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentscollegemanage/vo/AidingStudentsCollegeManagePageReqVO.java

@@ -15,17 +15,29 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class AidingStudentsCollegeManagePageReqVO extends PageParam {
 
-    @Schema(description = "学生提交时间段时间")
+    @Schema(description = "学生提交开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] submitTime;
+    private LocalDateTime submitStartTime;
 
-    @Schema(description = "班级民主评议时间段")
+    @Schema(description = "学生提交结束时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] evaluationTime;
+    private LocalDateTime submitEndTime;
 
-    @Schema(description = "学院审核时间段")
+    @Schema(description = "班级民主评议开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] auditTime;
+    private LocalDateTime evaluationStartTime;
+
+    @Schema(description = "班级民主评议结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime evaluationEndTime;
+
+    @Schema(description = "学院审核开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime auditStartTime;
+
+    @Schema(description = "学院审核结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime auditEndTime;
 
     @Schema(description = "公示时间段")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentscollegemanage/vo/AidingStudentsCollegeManageProjectInfoPageRespVO.java

@@ -16,21 +16,33 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class AidingStudentsCollegeManageProjectInfoPageRespVO extends PageParam {
-    @Schema(description = "学生提交时间段时间")
+    @Schema(description = "学生提交开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] submitTime;
+    private LocalDateTime submitStartTime;
 
-    @Schema(description = "班级民主评议时间段")
+    @Schema(description = "学生提交结束时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] evaluationTime;
+    private LocalDateTime submitEndTime;
 
-    @Schema(description = "学院审核时间段")
+    @Schema(description = "班级民主评议开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] auditTime;
+    private LocalDateTime evaluationStartTime;
+
+    @Schema(description = "班级民主评议结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime evaluationEndTime;
+
+    @Schema(description = "学院审核开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime auditStartTime;
+
+    @Schema(description = "学院审核结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime auditEndTime;
 
     @Schema(description = "公示时间段")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] publicityTime;
+    private LocalDateTime publicityTime;
 
     @Schema(description = "状态值，待发布0，评审中1，公示中2，，已上报3", example = "1")
     private Integer comStatus;
@@ -53,7 +65,7 @@ public class AidingStudentsCollegeManageProjectInfoPageRespVO extends PageParam
 
     @Schema(description = "上报时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] reportingTime;
+    private LocalDateTime reportingTime;
 
 
 

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentscollegemanage/vo/AidingStudentsCollegeManageProjectInfoRespVO.java

@@ -26,17 +26,29 @@ public class AidingStudentsCollegeManageProjectInfoRespVO {
     @ExcelProperty("id")
     private Long id;
 
-    @Schema(description = "学生提交时间段时间")
-    @ExcelProperty("学生提交时间段时间")
-    private String submitTime;
+    @Schema(description = "学生提交开始时间")
+    @ExcelProperty("学生提交开始时间")
+    private LocalDateTime submitStartTime;
 
-    @Schema(description = "班级民主评议时间段")
-    @ExcelProperty("班级民主评议时间段")
-    private String evaluationTime;
+    @Schema(description = "学生提交结束时间")
+    @ExcelProperty("学生提交结束时间")
+    private LocalDateTime submitEndTime;
 
-    @Schema(description = "学院审核时间段")
-    @ExcelProperty("学院审核时间段")
-    private String auditTime;
+    @Schema(description = "班级民主评议开始时间")
+    @ExcelProperty("班级民主评议开始时间")
+    private LocalDateTime evaluationStartTime;
+
+    @Schema(description = "班级民主评议结束时间")
+    @ExcelProperty("班级民主评议结束时间")
+    private LocalDateTime evaluationEndTime;
+
+    @Schema(description = "学院审核开始时间")
+    @ExcelProperty("学院审核开始时间")
+    private LocalDateTime auditStartTime;
+
+    @Schema(description = "学院审核结束时间")
+    @ExcelProperty("学院审核结束时间")
+    private LocalDateTime auditEndTime;
 
     @Schema(description = "公示时间段")
     @ExcelProperty("公示时间段")

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentscollegemanage/vo/AidingStudentsCollegeManageRespVO.java

@@ -21,21 +21,33 @@ public class AidingStudentsCollegeManageRespVO {
     @ExcelProperty("id")
     private Long id;
 
-    @Schema(description = "学生提交时间段时间")
-    @ExcelProperty("学生提交时间段时间")
-    private String submitTime;
+    @Schema(description = "学生提交开始时间")
+    @ExcelProperty("学生提交开始时间")
+    private LocalDateTime submitStartTime;
 
-    @Schema(description = "班级民主评议时间段")
-    @ExcelProperty("班级民主评议时间段")
-    private String evaluationTime;
+    @Schema(description = "学生提交结束时间")
+    @ExcelProperty("学生提交结束时间")
+    private LocalDateTime submitEndTime;
 
-    @Schema(description = "学院审核时间段")
-    @ExcelProperty("学院审核时间段")
-    private String auditTime;
+    @Schema(description = "班级民主评议开始时间")
+    @ExcelProperty("班级民主评议开始时间")
+    private LocalDateTime evaluationStartTime;
+
+    @Schema(description = "班级民主评议结束时间")
+    @ExcelProperty("班级民主评议结束时间")
+    private LocalDateTime evaluationEndTime;
+
+    @Schema(description = "学院审核开始时间")
+    @ExcelProperty("学院审核开始时间")
+    private LocalDateTime auditStartTime;
+
+    @Schema(description = "学院审核结束时间")
+    @ExcelProperty("学院审核结束时间")
+    private LocalDateTime auditEndTime;
 
     @Schema(description = "公示时间段")
     @ExcelProperty("公示时间段")
-    private String publicityTime;
+    private LocalDateTime publicityTime;
 
     @Schema(description = "状态值，待发布0，评审中1，公示中2，，已上报3", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("状态值，待发布0，评审中1，公示中2，，已上报3")
@@ -43,7 +55,7 @@ public class AidingStudentsCollegeManageRespVO {
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
-    private String createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "项目管理id", example = "1134")
     @ExcelProperty("项目管理id")
@@ -63,6 +75,6 @@ public class AidingStudentsCollegeManageRespVO {
 
     @Schema(description = "上报时间")
     @ExcelProperty("上报时间")
-    private String reportingTime;
+    private LocalDateTime reportingTime;
 
 }

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentscollegemanage/vo/AidingStudentsCollegeManageSaveReqVO.java

@@ -14,14 +14,24 @@ public class AidingStudentsCollegeManageSaveReqVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2482")
     private Long id;
 
-    @Schema(description = "学生提交时间段时间")
-    private LocalDateTime submitTime;
+    @Schema(description = "学生提交开始时间")
+    private LocalDateTime submitStartTime;
 
-    @Schema(description = "班级民主评议时间段")
-    private LocalDateTime evaluationTime;
+    @Schema(description = "学生提交结束时间")
+    private LocalDateTime submitEndTime;
+
+    @Schema(description = "班级民主评议开始时间")
+    private LocalDateTime evaluationStartTime;
+
+    @Schema(description = "班级民主评议结束时间")
+    private LocalDateTime evaluationEndTime;
+
+    @Schema(description = "学院审核开始时间")
+    private LocalDateTime auditStartTime;
+
+    @Schema(description = "学院审核结束时间")
+    private LocalDateTime auditEndTime;
 
-    @Schema(description = "学院审核时间段")
-    private LocalDateTime auditTime;
 
     @Schema(description = "公示时间段")
     private LocalDateTime publicityTime;

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentscollegemanage/vo/AidingStudentsCollegeManageStudentRespVO.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - 学生显示 家庭困难认定项目学院管理 Response VO")
 @Data
 public class AidingStudentsCollegeManageStudentRespVO {
@@ -11,11 +13,15 @@ public class AidingStudentsCollegeManageStudentRespVO {
     @ExcelProperty("id")
     private Long id;
 
-    @Schema(description = "学生提交时间段时间")
-    @ExcelProperty("学生提交时间段时间")
-    private String submitTime;
-    @Schema(description = "学院通知文件")
+    @Schema(description = "学生提交开始时间")
+    @ExcelProperty("学生提交开始时间")
+    private LocalDateTime submitStartTime;
 
+    @Schema(description = "学生提交结束时间")
+    @ExcelProperty("学生提交结束时间")
+    private LocalDateTime submitEndTime;
+
+    @Schema(description = "学院通知文件")
     @ExcelProperty("学院通知文件")
     private String[] collegeNoticeFile;
 

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/aidingstudentscollegemanage/AidingStudentsCollegeManageDO.java

@@ -33,17 +33,29 @@ public class AidingStudentsCollegeManageDO extends BaseDO {
     @TableId
     private Long id;
     /**
-     * 学生提交时间段时间
+     * 学生提交开始时间
      */
-    private LocalDateTime submitTime;
+    private LocalDateTime submitStartTime;
     /**
-     * 班级民主评议时间段
+     * 学生提交结束时间
      */
-    private LocalDateTime evaluationTime;
+    private LocalDateTime submitEndTime;
     /**
-     * 学院审核时间段
+     * 班级民主评议开始时间
      */
-    private LocalDateTime auditTime;
+    private LocalDateTime evaluationStartTime;
+    /**
+     * 班级民主评议结束时间
+     */
+    private LocalDateTime evaluationEndTime;
+    /**
+     * 学院审核开始时间
+     */
+    private LocalDateTime auditStartTime;
+    /**
+     * 学院审核结束时间
+     */
+    private LocalDateTime auditEndTime;
     /**
      * 公示时间段
      */

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/aidingstudentscollegemanage/AidingStudentsCollegeManageProjectInfoPageRespDO.java

@@ -21,49 +21,47 @@ public class AidingStudentsCollegeManageProjectInfoPageRespDO extends PageParam
     @ExcelProperty("id")
     private Long id;
 
-    @Schema(description = "学生提交时间段时间")
-    @ExcelProperty("学生提交时间段时间")
-    private String submitTime;
+    @Schema(description = "学生提交开始时间")
+    private LocalDateTime submitStartTime;
 
-    @Schema(description = "班级民主评议时间段")
-    @ExcelProperty("班级民主评议时间段")
-    private String evaluationTime;
+    @Schema(description = "学生提交结束时间")
+    private LocalDateTime submitEndTime;
 
-    @Schema(description = "学院审核时间段")
-    @ExcelProperty("学院审核时间段")
-    private String auditTime;
+    @Schema(description = "班级民主评议开始时间")
+    private LocalDateTime evaluationStartTime;
+
+    @Schema(description = "班级民主评议结束时间")
+    private LocalDateTime evaluationEndTime;
+
+    @Schema(description = "学院审核开始时间")
+    private LocalDateTime auditStartTime;
+
+    @Schema(description = "学院审核结束时间")
+    private LocalDateTime auditEndTime;
 
     @Schema(description = "公示时间段")
-    @ExcelProperty("公示时间段")
-    private String publicityTime;
+    private LocalDateTime publicityTime;
 
     @Schema(description = "状态值，待发布0，评审中1，公示中2，，已上报3", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("状态值，待发布0，评审中1，公示中2，，已上报3")
     private Integer comStatus;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private String createTime;
+    private LocalDateTime createTime;
 
     @Schema(description = "项目管理id", example = "1134")
-    @ExcelProperty("项目管理id")
     private Long manageId;
 
     @Schema(description = "学院部门id", example = "32049")
-    @ExcelProperty("学院部门id")
     private Long collegeId;
 
     @Schema(description = "学院通知文件")
-    @ExcelProperty("学院通知文件")
     private String collegeNoticeFile;
 
     @Schema(description = "学院通知文件名称", example = "芋艿")
-    @ExcelProperty("学院通知文件名称")
     private String collegeNoticeFileName;
 
     @Schema(description = "上报时间")
-    @ExcelProperty("上报时间")
-    private String reportingTime;
+    private LocalDateTime reportingTime;
 
 
 
@@ -80,7 +78,7 @@ public class AidingStudentsCollegeManageProjectInfoPageRespDO extends PageParam
 
     @Schema(description = "截止时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String diEndTime;
+    private LocalDateTime diEndTime;
 
     @Schema(description = "家庭经济困难学生认定项目通知富文本")
     private String diNotice;

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/aidingstudentscollegemanage/AidingStudentsCollegeManageMapper.java

@@ -22,9 +22,6 @@ public interface AidingStudentsCollegeManageMapper extends BaseMapperX<AidingStu
 
     default PageResult<AidingStudentsCollegeManageDO> selectPage(AidingStudentsCollegeManagePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<AidingStudentsCollegeManageDO>()
-                .betweenIfPresent(AidingStudentsCollegeManageDO::getSubmitTime, reqVO.getSubmitTime())
-                .betweenIfPresent(AidingStudentsCollegeManageDO::getEvaluationTime, reqVO.getEvaluationTime())
-                .betweenIfPresent(AidingStudentsCollegeManageDO::getAuditTime, reqVO.getAuditTime())
                 .betweenIfPresent(AidingStudentsCollegeManageDO::getPublicityTime, reqVO.getPublicityTime())
                 .eqIfPresent(AidingStudentsCollegeManageDO::getComStatus, reqVO.getComStatus())
                 .betweenIfPresent(AidingStudentsCollegeManageDO::getCreateTime, reqVO.getCreateTime())
@@ -37,7 +34,7 @@ public interface AidingStudentsCollegeManageMapper extends BaseMapperX<AidingStu
     }
 
     @Select("SELECT as_aiding_students_manage.id,di_name,di_status,di_notice,di_notice_file,di_notice_file_name,di_end_time, " +
-            "submit_time,evaluation_time,audit_time,publicity_time,com_status,manage_id,college_id,college_notice_file,college_notice_file_name,reporting_time,as_aiding_students_manage.create_time ,as_aiding_students_manage.creator " +
+            "submit_start_time,submit_end_time,evaluation_start_time,evaluation_end_time,audit_start_time,audit_end_time,publicity_time,com_status,manage_id,college_id,college_notice_file,college_notice_file_name,reporting_time,as_aiding_students_manage.create_time ,as_aiding_students_manage.creator " +
             "FROM as_aiding_students_manage left join as_aiding_students_college_manage on  as_aiding_students_manage.id= as_aiding_students_college_manage.manage_id and as_aiding_students_college_manage.deleted=false " +
             "where as_aiding_students_manage.deleted=false and as_aiding_students_manage.di_status!=0 " +
             "ORDER BY as_aiding_students_manage.create_time DESC  limit #{pageSize} offset #{offset}")