学生提交申请信息V8.0

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/AidingStudentsPersonManageController.java

@@ -59,9 +59,9 @@ public class AidingStudentsPersonManageController {
         return success(true);
     }
 
-    @GetMapping("/college-get-page")
+    @GetMapping("/college-get-student-data")
     @Operation(summary = "学院信息数据统计")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:college-get-page')")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:college-get-student-data')")
     public CommonResult<PageResult<AidingStudentPersonManageInfoRespVO>> getAidingStudentsPersonManageCollegeData(@Valid @RequestBody AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         return success(aidingStudentsPersonManageService.getAidingStudentsPersonManageCollegeData(pageReqVO));
     }
@@ -74,9 +74,9 @@ public class AidingStudentsPersonManageController {
         return success(BeanUtils.toBean(pageResult, AidingStudentPersonManageInfoRespVO.class));
     }*/
 
-    @PutMapping("/all-sort")
+    @PutMapping("/sort")
     @Operation(summary = "定序")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:all-sort')")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:sort')")
     public CommonResult<Boolean> allsortAidingStudentsPersonManage(@Valid @RequestBody List<AidingStudentPersonManageSortReqVO> ids){
         aidingStudentsPersonManageService.allsortAidingStudentsManage(ids);
         return success(true);
@@ -91,16 +91,16 @@ public class AidingStudentsPersonManageController {
         return success(true);
     }
 
-    @GetMapping("/school-get-page")
-    @Operation(summary = "学校模糊查询获取学生申请名单分页")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:school-get-page')")
+    @GetMapping("/page")
+    @Operation(summary = "学生信息分页")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:page')")
     public CommonResult<PageResult<AidingStudentPersonManageInfoRespVO>> schoolgetAidingStudentsPersonManagePage(@Valid @RequestBody AidingStudentPersonManageInfoPageReqVO pageReqVO) {
         return success(aidingStudentsPersonManageService.schoolgetAidingStudentsPersonManagePage(pageReqVO));
     }
 
-    @GetMapping("/school-get-student-info-part")
+    @GetMapping("/school-get-student-data")
     @Operation(summary = "学校获取统计数据（部分）")
-    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:school-get-student-info-part')")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:school-get-student-data')")
     public CommonResult<AidingStudentPersonManageInfoRespVO> schoolgetAidingStudentsPersonManageData(@Valid @RequestParam("manageId")Integer manageId) {
         return success(aidingStudentsPersonManageService.schoolgetAidingStudentsPersonManageData(manageId));
     }
@@ -112,8 +112,4 @@ public class AidingStudentsPersonManageController {
         return success(aidingStudentsPersonManageService.schoolauditAidingStudentsPersonManageData(id));
     }
 
-
-
-
-
 }

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/vo/AidingStudentPersonManageClassVO.java

@@ -27,4 +27,6 @@ public class AidingStudentPersonManageClassVO {
     private Integer classEdit;
     // 已经通过人数
     private Integer classPass;
+    // 流程
+    private String processInstanceId;
 }

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/aidingstudentspersonmanage/vo/AidingStudentPersonManageInfoRespVO.java

@@ -62,6 +62,8 @@ public class AidingStudentPersonManageInfoRespVO {
     private Integer collegeSuggestionDifficultType;
     // 学校建议困难类型
     private Integer schoolSuggestionDifficultType;
+    // 流程
+    private String processInstanceId;
     /**
      * 学生（上传材料）
      */

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/financialaidstudentmange/FinancialAidStudentManageController.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManageInfoRespVO;
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManageRespVO;
+import cn.iocoder.yudao.module.as.service.financialaidstudentmange.FinancialAidStudentManageService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * @autor WoVoM
+ * @data 2024/7/16 14:54
+ * @@version 1.0
+ */
+@Tag(name = "管理后台 - 助学金评定项目学生管理")
+@RestController
+@RequestMapping("/as/financial-aid-student-manage")
+@Validated
+public class FinancialAidStudentManageController {
+
+    @Autowired
+    private FinancialAidStudentManageService financialAidStudentManageService;
+
+    @GetMapping("/before-upload")
+    @Operation(summary = "回显学生上传材料")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:before-upload')")
+    public CommonResult<FinancialAidStudentManageRespVO> beforeuploadAidingStudentsPersonManage() {
+        return success(financialAidStudentManageService.beforeuploadAidingStudentsManage());
+    }
+
+    @PostMapping("/upload")
+    @Operation(summary = "学生上传材料")
+    @PreAuthorize("@ss.hasPermission('as:aiding-students-person-manage:upload')")
+    public CommonResult<Boolean> uploadAidingStudentsPersonManage(@Valid @RequestBody FinancialAidStudentManageRespVO uploadVO) {
+        financialAidStudentManageService.uploadAidingStudentsManage(uploadVO);
+        return success(true);
+    }
+
+}

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/controller/admin/financialaidstudentmange/vo/FinancialAidStudentManageRespVO.java

@@ -0,0 +1,16 @@
+package cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @autor WoVoM
+ * @data 2024/7/16 15:03
+ * @@version 1.0
+ */
+@Schema(description = "管理后台 - 助学金评定项目学生管理 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class FinancialAidStudentManageRespVO {
+}

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/aidingstudentspersonmanage/AidingStudentsPersonManageDO.java

@@ -69,4 +69,6 @@ public class AidingStudentsPersonManageDO extends BaseDO {
     private Integer collegeSuggestionDifficultType;
     // 学校建议困难类型
     private Integer schoolSuggestionDifficultType;
+    // 流程
+    private String processInstanceId;
 }

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/dataobject/financialaidstudentmange/FinancialAidStudentManageDO.java

@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.as.dal.dataobject.financialaidstudentmange;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * 助学
+ * @autor WoVoM
+ * @data 2024/7/16 14:52
+ * @@version 1.0
+ */
+@TableName("as_stipend")
+@KeySequence("as_financial_aid_manage_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FinancialAidStudentManageDO extends BaseDO {
+    // 序号
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    // 学校项目ID
+    private Integer manageId;
+    // 学院项目ID
+    private Integer collegeMangeId;
+    // 学院ID
+    private Integer collegeId;
+    // 姓名
+    private String name;
+    // 流程
+    private String processInstanceId;
+}

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/financialaidstudentmange/FinancialAidStudentManageMapper.java

@@ -0,0 +1,14 @@
+package cn.iocoder.yudao.module.as.dal.mysql.financialaidstudentmange;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.as.dal.dataobject.financialaidstudentmange.FinancialAidStudentManageDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @autor WoVoM
+ * @data 2024/7/16 14:57
+ * @@version 1.0
+ */
+@Mapper
+public interface FinancialAidStudentManageMapper extends BaseMapperX<FinancialAidStudentManageDO> {
+}

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/aidingstudentspersonmanage/AidingStudentsPersonManageServiceImpl.java

@@ -99,6 +99,7 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
         aDo.setGrade((String) map.get("SZNJ"));
         aDo.setNickname(user.getNickname());
         aDo.setStatus(0);
+
         aidingStudentsPersonManageMapper.insert(aDo);
     }
 

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/financialaidstudentmange/FinancialAidStudentManageService.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.as.service.financialaidstudentmange;
+
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManageRespVO;
+
+/**
+ * @autor WoVoM
+ * @data 2024/7/16 14:55
+ * @@version 1.0
+ */
+public interface FinancialAidStudentManageService {
+
+    /**
+     * 先将家庭困难信息认定结果返回
+     * @return
+     */
+    FinancialAidStudentManageRespVO beforeuploadAidingStudentsManage();
+
+    /**
+     * 学生上传材料
+     * @param uploadVO
+     */
+    void uploadAidingStudentsManage(FinancialAidStudentManageRespVO uploadVO);
+
+
+}

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/service/financialaidstudentmange/FinancialAidStudentManageServiceImpl.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.as.service.financialaidstudentmange;
+
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManageRespVO;
+import cn.iocoder.yudao.module.as.dal.dataobject.financialaidstudentmange.FinancialAidStudentManageDO;
+import cn.iocoder.yudao.module.as.dal.mysql.aidingstudentsmanage.AidingStudentsManageMapper;
+import cn.iocoder.yudao.module.as.dal.mysql.financialaidstudentmange.FinancialAidStudentManageMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @autor WoVoM
+ * @data 2024/7/16 14:56
+ * @@version 1.0
+ */
+@Service
+@Slf4j
+public class FinancialAidStudentManageServiceImpl extends ServiceImpl<FinancialAidStudentManageMapper, FinancialAidStudentManageDO> implements FinancialAidStudentManageService {
+    @Autowired
+    private AidingStudentsManageMapper aidingStudentsManageMapper;
+
+    /**
+     * 先将家庭困难信息认定结果返回
+     *
+     * @return
+     */
+    @Override
+    public FinancialAidStudentManageRespVO beforeuploadAidingStudentsManage() {
+        return null;
+    }
+
+    /**
+     * 学生上传材料
+     * @param uploadVO
+     */
+    @Override
+    public void uploadAidingStudentsManage(FinancialAidStudentManageRespVO uploadVO) {
+        // 0.验证
+
+        // 1.上传
+
+    }
+}