修复1排序

  1文件数组
  1根据状态值查询
  1提供创建人
  1获得学校项目创建时间
  1导入名单默认覆盖

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

@@ -45,10 +45,10 @@ public class AidingStudentsCollegeManagePageReqVO extends PageParam {
     private Long collegeId;
 
     @Schema(description = "学院通知文件")
-    private String collegeNoticeFile;
+    private String[] collegeNoticeFile;
 
     @Schema(description = "学院通知文件名称", example = "芋艿")
-    private String collegeNoticeFileName;
+    private String[] collegeNoticeFileName;
 
     @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

@@ -46,10 +46,10 @@ public class AidingStudentsCollegeManageProjectInfoPageRespVO extends PageParam
     private Long collegeId;
 
     @Schema(description = "学院通知文件")
-    private String collegeNoticeFile;
+    private String[] collegeNoticeFile;
 
     @Schema(description = "学院通知文件名称", example = "芋艿")
-    private String collegeNoticeFileName;
+    private String[] collegeNoticeFileName;
 
     @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/AidingStudentsCollegeManageProjectInfoRespVO.java

@@ -91,10 +91,10 @@ public class AidingStudentsCollegeManageProjectInfoRespVO {
     private String diNotice;
 
     @Schema(description = "家庭经济困难学生认定项目评审规则文件")
-    private String diNoticeFile;
+    private String[] diNoticeFile;
 
     @Schema(description = "家庭经济困难学生认定项目评审规则文件名称", example = "芋艿")
-    private String diNoticeFileName;
+    private String[] diNoticeFileName;
 
     @Schema(description = "创建人")
     private String creator;

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

@@ -55,11 +55,11 @@ public class AidingStudentsCollegeManageRespVO {
 
     @Schema(description = "学院通知文件")
     @ExcelProperty("学院通知文件")
-    private String collegeNoticeFile;
+    private String[] collegeNoticeFile;
 
     @Schema(description = "学院通知文件名称", example = "芋艿")
     @ExcelProperty("学院通知文件名称")
-    private String collegeNoticeFileName;
+    private String[] collegeNoticeFileName;
 
     @Schema(description = "上报时间")
     @ExcelProperty("上报时间")

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

@@ -37,10 +37,10 @@ public class AidingStudentsCollegeManageSaveReqVO {
     private Long collegeId;
 
     @Schema(description = "学院通知文件")
-    private String collegeNoticeFile;
+    private String[] collegeNoticeFile;
 
     @Schema(description = "学院通知文件名称", example = "芋艿")
-    private String collegeNoticeFileName;
+    private String[] collegeNoticeFileName;
 
     @Schema(description = "上报时间")
     private LocalDateTime reportingTime;

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

@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentscollegemanage;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 家庭困难认定项目学院项目信息管理分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class AidingStudentsCollegeManageProjectInfoPageRespDO extends PageParam {
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "2482")
+    @ExcelProperty("id")
+    private Long id;
+
+    @Schema(description = "学生提交时间段时间")
+    @ExcelProperty("学生提交时间段时间")
+    private String submitTime;
+
+    @Schema(description = "班级民主评议时间段")
+    @ExcelProperty("班级民主评议时间段")
+    private String evaluationTime;
+
+    @Schema(description = "学院审核时间段")
+    @ExcelProperty("学院审核时间段")
+    private String auditTime;
+
+    @Schema(description = "公示时间段")
+    @ExcelProperty("公示时间段")
+    private String 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;
+
+    @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;
+
+
+
+
+    @Schema(description = "项目标题", example = "赵六")
+    private String diName;
+
+    @Schema(description = "状态值，待发布0，进行中1，已完成2", example = "1")
+    private Integer diStatus;
+
+/*    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;*/
+
+    @Schema(description = "截止时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private String diEndTime;
+
+    @Schema(description = "家庭经济困难学生认定项目通知富文本")
+    private String diNotice;
+
+    @Schema(description = "家庭经济困难学生认定项目评审规则文件")
+    private String[] diNoticeFile;
+
+    @Schema(description = "家庭经济困难学生认定项目评审规则文件名称", example = "芋艿")
+    private String[] diNoticeFileName;
+
+    @Schema(description = "创建人")
+    private String creator;
+
+    /*@Schema(description = "助学项目管理vo类")
+    private AidingStudentsManageRespVO projectInfo;
+    @Schema(description = "助学项目学院管理vo类")
+    private AidingStudentsCollegeManageRespVO collegeInfo;*/
+}

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

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentscollegemanage.AidingStudentsCollegeManageDO;
+import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentscollegemanage.AidingStudentsCollegeManageProjectInfoPageRespDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo.*;
 import org.apache.ibatis.annotations.Param;
@@ -30,7 +31,7 @@ public interface AidingStudentsCollegeManageMapper extends BaseMapperX<AidingStu
                 .eqIfPresent(AidingStudentsCollegeManageDO::getManageId, reqVO.getManageId())
                 .eqIfPresent(AidingStudentsCollegeManageDO::getCollegeId, reqVO.getCollegeId())
                 .eqIfPresent(AidingStudentsCollegeManageDO::getCollegeNoticeFile, reqVO.getCollegeNoticeFile())
-                .likeIfPresent(AidingStudentsCollegeManageDO::getCollegeNoticeFileName, reqVO.getCollegeNoticeFileName())
+                //.likeIfPresent(AidingStudentsCollegeManageDO::getCollegeNoticeFileName, reqVO.getCollegeNoticeFileName())
                 .betweenIfPresent(AidingStudentsCollegeManageDO::getReportingTime, reqVO.getReportingTime())
                 .orderByDesc(AidingStudentsCollegeManageDO::getId));
     }
@@ -38,9 +39,9 @@ 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 " +
             "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=1  " +
+            "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}")
-    List<AidingStudentsCollegeManageProjectInfoRespVO> selectProjectInfoPage(@Param("pageSize") Integer pageSize, @Param("offset") Integer offset);
+    List<AidingStudentsCollegeManageProjectInfoPageRespDO> selectProjectInfoPage(@Param("pageSize") Integer pageSize, @Param("offset") Integer offset);
 
     @Select("SELECT count(1) 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")

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/aidingstudentscollegemanage/AidingStudentsCollegeManageServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.as.service.aidingstudentscollegemanage;
 
+import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentscollegemanage.AidingStudentsCollegeManageProjectInfoPageRespDO;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentsmanage.AidingStudentsManageDO;
 import cn.iocoder.yudao.module.as.dal.mysql.aidingstudentsmanage.AidingStudentsManageMapper;
 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -131,10 +132,14 @@ public class AidingStudentsCollegeManageServiceImpl implements AidingStudentsCol
 
     @Override
     public PageResult<AidingStudentsCollegeManageProjectInfoRespVO> getProjectInfoPage(AidingStudentsCollegeManageProjectInfoPageRespVO pageReqVO) {
+        //获得分页信息
         Integer pageNo = pageReqVO.getPageNo();
         Integer pageSize = pageReqVO.getPageSize();
         Integer offset = (pageNo - 1) *pageSize;
-        List<AidingStudentsCollegeManageProjectInfoRespVO> aidingStudentsCollegeManageProjectInfoRespVOS = aidingStudentsCollegeManageMapper.selectProjectInfoPage(pageSize,offset);
+        List<AidingStudentsCollegeManageProjectInfoPageRespDO> aidingStudentsCollegeManageProjectInfoRespDOS = aidingStudentsCollegeManageMapper.selectProjectInfoPage(pageSize,offset);
+        //转换
+        List<AidingStudentsCollegeManageProjectInfoRespVO> aidingStudentsCollegeManageProjectInfoRespVOS = BeanUtils.toBean(aidingStudentsCollegeManageProjectInfoRespDOS, AidingStudentsCollegeManageProjectInfoRespVO.class);
+        //判断
         if (aidingStudentsCollegeManageProjectInfoRespVOS != null){
             //获得学校项目创建人
             aidingStudentsCollegeManageProjectInfoRespVOS.forEach(aidingStudentsCollegeManageProjectInfoRespVO -> {