学院查询分页

yudao-module-as/yudao-module-as-api/src/main/java/cn/iocoder/yudao/module/as/enums/ErrorCodeConstants.java

@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
  */
 public interface ErrorCodeConstants {
     ErrorCode AIDING_STUDENTS_MANAGE_NOT_EXISTS = new ErrorCode( 2_009_000_001, "家庭困难认定项目管理不存在");
-    ErrorCode AIDING_STUDENTS_COLLEGE_MANAGE_NOT_EXISTS = new ErrorCode(2_009_000_002, "综测项目学院管理不存在");
+    ErrorCode AIDING_STUDENTS_COLLEGE_MANAGE_NOT_EXISTS = new ErrorCode(2_009_000_002, "助学项目学院管理不存在");
     ErrorCode FINANCIAL_AID_MANAGE_NOT_EXISTS = new ErrorCode(2_009_000_003, "助学金项目管理不存在");
     ErrorCode FINANCIAL_AID_COLLEGE_MANAGE_NOT_EXISTS = new ErrorCode(2_009_000_004,  "助学金评定项目学院管理不存在");
     ErrorCode AIDING_STUDENTS_IMPORT_LIST_NOT_EXISTS = new ErrorCode(2_009_000_005,  "自治区名单中该学生不存在");

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

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage;
 
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -8,7 +9,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
@@ -71,6 +71,8 @@ public class AidingStudentsCollegeManageController {
         return success(BeanUtils.toBean(aidingStudentsCollegeManage, AidingStudentsCollegeManageRespVO.class));
     }
 
+    //@GetMapping("/")
+
     @GetMapping("/getCount")
     @Operation(summary = "获得家庭困难认定项目学院管理各个状态人数")
     @PreAuthorize("@ss.hasPermission('as:aiding-students-college-manage:get-count')")
@@ -79,6 +81,14 @@ public class AidingStudentsCollegeManageController {
         return success(map);
     }
 
+    @GetMapping("/getCollegeAllStudent")
+    @Operation(summary = "获得学院所有学生")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-college-manage:get-college-all-student')")
+    public CommonResult<List<AdminUserRespDTO>> getCollegeAllStudent() {
+        List<AdminUserRespDTO> list = aidingStudentsCollegeManageService.getCollegeAllStudent();
+        return success(list);
+    }
+
 
     @GetMapping("/page")
     @Operation(summary = "获得家庭困难认定项目学院管理分页")
@@ -87,6 +97,17 @@ public class AidingStudentsCollegeManageController {
         PageResult<AidingStudentsCollegeManageDO> pageResult = aidingStudentsCollegeManageService.getAidingStudentsCollegeManagePage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, AidingStudentsCollegeManageRespVO.class));
     }
+    @GetMapping("/projectInfo")
+    @Operation(summary = "获得家庭困难认定项目学院管理项目详细信息分页")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-college-manage:query')")
+    public CommonResult<PageResult<AidingStudentsCollegeManageProjectInfoRespVO>> getProjectInfoPage(@Valid AidingStudentsCollegeManageProjectInfoPageRespVO pageReqVO) {
+
+        PageResult<AidingStudentsCollegeManageProjectInfoRespVO> pageResult = aidingStudentsCollegeManageService.getProjectInfoPage(pageReqVO);
+        return success(pageResult);
+    }
+
+
+
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出家庭困难认定项目学院管理 Excel")

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

@@ -0,0 +1,87 @@
+package cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+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 AidingStudentsCollegeManageProjectInfoPageRespVO extends PageParam {
+    @Schema(description = "学生提交时间段时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] submitTime;
+
+    @Schema(description = "班级民主评议时间段")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] evaluationTime;
+
+    @Schema(description = "学院审核时间段")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] auditTime;
+
+    @Schema(description = "公示时间段")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] publicityTime;
+
+    @Schema(description = "状态值，待发布0，评审中1，公示中2，，已上报3", example = "1")
+    private Integer comStatus;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "项目管理id", example = "1134")
+    private Long manageId;
+
+    @Schema(description = "学院部门id", example = "32049")
+    private Long collegeId;
+
+    @Schema(description = "学院通知文件")
+    private String collegeNoticeFile;
+
+    @Schema(description = "学院通知文件名称", example = "芋艿")
+    private String collegeNoticeFileName;
+
+    @Schema(description = "上报时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] 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 LocalDateTime[] diEndTime;
+
+    @Schema(description = "家庭经济困难学生认定项目通知富文本")
+    private String diNotice;
+
+    @Schema(description = "家庭经济困难学生认定项目评审规则文件")
+    private String diNoticeFile;
+
+    @Schema(description = "家庭经济困难学生认定项目评审规则文件名称", example = "芋艿")
+    private String diNoticeFileName;
+
+
+
+
+}

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

@@ -0,0 +1,104 @@
+package cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo;
+
+import cn.iocoder.yudao.module.as.controller.admin.aidingstudentsmanage.vo.AidingStudentsManageRespVO;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+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 = "管理后台 - 家庭困难认定项目学院项目信息管理 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class AidingStudentsCollegeManageProjectInfoRespVO {
+    @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;
+
+    //@TableField(value = "di_notice_file_name")
+    @Schema(description = "家庭经济困难学生认定项目评审规则文件名称", example = "芋艿")
+    private String diNoticeFileName;
+
+    /*@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/controller/admin/aidingstudentscollegemanage/vo/AidingStudentsCollegeManageRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -8,6 +9,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
+
 @Schema(description = "管理后台 - 家庭困难认定项目学院管理 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -19,19 +23,19 @@ public class AidingStudentsCollegeManageRespVO {
 
     @Schema(description = "学生提交时间段时间")
     @ExcelProperty("学生提交时间段时间")
-    private LocalDateTime submitTime;
+    private String submitTime;
 
     @Schema(description = "班级民主评议时间段")
     @ExcelProperty("班级民主评议时间段")
-    private LocalDateTime evaluationTime;
+    private String evaluationTime;
 
     @Schema(description = "学院审核时间段")
     @ExcelProperty("学院审核时间段")
-    private LocalDateTime auditTime;
+    private String auditTime;
 
     @Schema(description = "公示时间段")
     @ExcelProperty("公示时间段")
-    private LocalDateTime publicityTime;
+    private String publicityTime;
 
     @Schema(description = "状态值，待发布0，评审中1，公示中2，，已上报3", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("状态值，待发布0，评审中1，公示中2，，已上报3")
@@ -39,7 +43,7 @@ public class AidingStudentsCollegeManageRespVO {
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
     @Schema(description = "项目管理id", example = "1134")
     @ExcelProperty("项目管理id")
@@ -59,6 +63,6 @@ public class AidingStudentsCollegeManageRespVO {
 
     @Schema(description = "上报时间")
     @ExcelProperty("上报时间")
-    private LocalDateTime reportingTime;
+    private String reportingTime;
 
 }

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

@@ -1,13 +1,15 @@
 package cn.iocoder.yudao.module.as.dal.mysql.aidingstudentscollegemanage;
 
-import java.util.*;
-
 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 org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo.*;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * 家庭困难认定项目学院管理 Mapper
@@ -33,4 +35,13 @@ public interface AidingStudentsCollegeManageMapper extends BaseMapperX<AidingStu
                 .orderByDesc(AidingStudentsCollegeManageDO::getId));
     }
 
+    @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_college_manage.create_time " +
+            "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  limit #{pageSize} offset #{offset} ")
+    List<AidingStudentsCollegeManageProjectInfoRespVO> 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")
+    Long selectProjectInfoPageCount();
 }

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

@@ -5,7 +5,7 @@ import javax.validation.*;
 import cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo.*;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentscollegemanage.AidingStudentsCollegeManageDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 
 /**
  * 家庭困难认定项目学院管理 Service 接口
@@ -53,4 +53,8 @@ public interface AidingStudentsCollegeManageService {
     PageResult<AidingStudentsCollegeManageDO> getAidingStudentsCollegeManagePage(AidingStudentsCollegeManagePageReqVO pageReqVO);
 
     Map<String, Long> getAidingStudentsCollegeManageCount();
+
+    List<AdminUserRespDTO> getCollegeAllStudent();
+
+    PageResult<AidingStudentsCollegeManageProjectInfoRespVO> getProjectInfoPage(AidingStudentsCollegeManageProjectInfoPageRespVO pageReqVO);
 }

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

@@ -1,17 +1,23 @@
 package cn.iocoder.yudao.module.as.service.aidingstudentscollegemanage;
 
+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;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+
 import cn.iocoder.yudao.module.as.controller.admin.aidingstudentscollegemanage.vo.*;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentscollegemanage.AidingStudentsCollegeManageDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.as.dal.mysql.aidingstudentscollegemanage.AidingStudentsCollegeManageMapper;
@@ -32,6 +38,8 @@ public class AidingStudentsCollegeManageServiceImpl implements AidingStudentsCol
     @Resource
     private AidingStudentsCollegeManageMapper aidingStudentsCollegeManageMapper;
     @Resource
+    private AidingStudentsManageMapper aidingStudentsManageMapper;
+    @Resource
     private AdminUserApi adminUserApi;
     @Resource
     private DeptApi deptApi;
@@ -39,10 +47,11 @@ public class AidingStudentsCollegeManageServiceImpl implements AidingStudentsCol
     @Override
     public Long createAidingStudentsCollegeManage(AidingStudentsCollegeManageSaveReqVO createReqVO) {
         // 获得学院id
-        Long deptId = adminUserApi.getUser(getLoginUserId()).getDeptId();
+        /*Long deptId = adminUserApi.getUser(getLoginUserId()).getDeptId();
         Long collegeId =  deptApi.getCollegeId(deptId);
-        createReqVO.setCollegeId(collegeId);
-
+        createReqVO.setCollegeId(collegeId);*/
+        //改变状态
+        createReqVO.setComStatus(1);
         // 插入
         AidingStudentsCollegeManageDO aidingStudentsCollegeManage = BeanUtils.toBean(createReqVO, AidingStudentsCollegeManageDO.class);
         aidingStudentsCollegeManageMapper.insert(aidingStudentsCollegeManage);
@@ -97,10 +106,57 @@ public class AidingStudentsCollegeManageServiceImpl implements AidingStudentsCol
         //map.put("publicity", aidingStudentsCollegeManageMapper.selectCount(AidingStudentsCollegeManageDO::getComStatus, 2));
         //进行中
         map.put("ongoing", aidingStudentsCollegeManageMapper.selectCount(AidingStudentsCollegeManageDO::getComStatus, 1)
-                +aidingStudentsCollegeManageMapper.selectCount(AidingStudentsCollegeManageDO::getComStatus, 2));
+                + aidingStudentsCollegeManageMapper.selectCount(AidingStudentsCollegeManageDO::getComStatus, 2));
         //已完成
         map.put("completed", aidingStudentsCollegeManageMapper.selectCount(AidingStudentsCollegeManageDO::getComStatus, 3));
         return map;
     }
 
+    @Override
+    public List<AdminUserRespDTO> getCollegeAllStudent() {
+        //获得学院id
+        Long deptId = adminUserApi.getUser(getLoginUserId()).getDeptId();
+        Long collegeId = deptApi.getCollegeId(deptId);
+
+
+        List<DeptRespDTO> childDeptList = deptApi.getChildDeptList(collegeId);
+        List<Long> deptIds = new ArrayList<>();
+        deptIds.add(collegeId);
+        for (DeptRespDTO deptRespDTO : childDeptList) {
+            deptIds.add(deptRespDTO.getId());
+        }
+        List<AdminUserRespDTO> userList = adminUserApi.getUserListByDeptIds(deptIds);
+        return userList;
+    }
+
+    @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);
+        if (aidingStudentsCollegeManageProjectInfoRespVOS != null){
+            return new PageResult<>(aidingStudentsCollegeManageProjectInfoRespVOS,aidingStudentsCollegeManageMapper.selectProjectInfoPageCount());
+        }
+        return null;
+
+    }
+
+    /*private List<AidingStudentsCollegeManageProjectInfoRespVO> merge2AidingStudentsCollegeManageProjectInfoRespVO
+            (List<AidingStudentsManageDO> aidingStudentsManageDOS, List<AidingStudentsCollegeManageDO> aidingStudentsCollegeManageDOS) {
+        List<AidingStudentsCollegeManageProjectInfoRespVO> aidingStudentsCollegeManageProjectInfoRespVOS = new ArrayList<>();
+
+        aidingStudentsManageDOS.forEach(aidingStudentsManageDO -> {
+            List<AidingStudentsCollegeManageDO> aidingStudentsCollegeManageDO = aidingStudentsCollegeManageMapper.selectList(Wrappers.lambdaQuery(AidingStudentsCollegeManageDO.class)
+                    .eq(AidingStudentsCollegeManageDO::getManageId, aidingStudentsManageDO.getId()));
+            if (aidingStudentsCollegeManageDO == null){
+                aidingStudentsCollegeManageProjectInfoRespVOS.add(AidingStudentsCollegeManageProjectInfoRespVO.builder()
+                        .projectInfo(aidingStudentsManageDO)
+                        .aidingStudentsCollegeManageDO(null)
+                        .build());
+            }
+        });
+    }*/
+
+
 }

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/aidingstudentsmanage/AidingStudentsManageServiceImpl.java

@@ -34,6 +34,8 @@ public class AidingStudentsManageServiceImpl implements AidingStudentsManageServ
         // 插入
         AidingStudentsManageDO aidingStudentsManage = BeanUtils.toBean(createReqVO, AidingStudentsManageDO.class);
         aidingStudentsManageMapper.insert(aidingStudentsManage);
+        //改变状态
+        aidingStudentsManage.setDiStatus(1);
         // 返回
         return aidingStudentsManage.getId();
     }