学生提交申请信息V9.1

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

@@ -1,12 +1,10 @@
-package cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange;
+package cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManageInfoPageReqVO;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManageInfoRespVO;
-import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManagePageReqVO;
-import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManageRespVO;
-import cn.iocoder.yudao.module.as.service.financialaidstudentmange.FinancialAidStudentManageService;
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage.vo.FinancialAidStudentManagePageReqVO;
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage.vo.FinancialAidStudentManageRespVO;
+import cn.iocoder.yudao.module.as.service.financialaidstudentmanage.FinancialAidStudentManageService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,4 +54,6 @@ public class FinancialAidStudentManageController {
         return success(financialAidStudentManageService.getAidingStudentsPersonManagePage(pageReqVO));
     }
 
+
+
 }

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo;
+package cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage.vo;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo;
+package cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;

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

@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.as.dal.dataobject.financialaidstudentmange;
+package cn.iocoder.yudao.module.as.dal.dataobject.financialaidstudentmanage;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;

yudao-module-as/yudao-module-as-biz/src/main/java/cn/iocoder/yudao/module/as/dal/mysql/aidingstudentspersonmanage/AidingStudentsPersonManageMapper.java

@@ -42,6 +42,7 @@ public interface AidingStudentsPersonManageMapper extends BaseMapperX<AidingStud
     @Select("select * from data_student_info where student_id = #{Id}")
     Map getByStudentId(String Id);
 
+
     default List<AidingStudentsPersonManageDO>  selectListByProcessInstanceId(List<String> ids,
                                                                               BpmTaskPageReqVO pageVO){
         return selectList(

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

@@ -1,7 +1,7 @@
-package cn.iocoder.yudao.module.as.dal.mysql.financialaidstudentmange;
+package cn.iocoder.yudao.module.as.dal.mysql.financialaidstudentmanage;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.as.dal.dataobject.financialaidstudentmange.FinancialAidStudentManageDO;
+import cn.iocoder.yudao.module.as.dal.dataobject.financialaidstudentmanage.FinancialAidStudentManageDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

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

@@ -69,11 +69,11 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
             AdminUserRespDTO user = adminUserApi.getUser(getLoginUser().getId());
             AidingStudentPersonManageInfoRespVO result = new AidingStudentPersonManageInfoRespVO();
             Map map = aidingStudentsPersonManageMapper.getByStudentId(user.getStudentId());
-            result.setClassName((String) map.get("SZBJMC"));
-            result.setStudentId(user.getStudentId());
-            result.setEnrollmentYear((String) map.get("RXNY"));
-            result.setIdCard((String) map.get("SFZJH"));
-            result.setRegisteredResidence((String) map.get("JG"));
+            result.setClassName((String) map.get("SZBJMC"))
+                    .setStudentId(user.getStudentId())
+                    .setEnrollmentYear((String) map.get("RXNY"))
+                    .setIdCard((String) map.get("SFZJH"))
+                    .setRegisteredResidence((String) map.get("JG"));
             return result;
         } catch (Exception exception) {
             exception.printStackTrace();
@@ -95,26 +95,23 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
                         .eq(AidingStudentsPersonManageDO::getManageId, uploadVO.getManageId())
                         .eq(AidingStudentsPersonManageDO::getCollegeManageId, uploadVO.getCollegeManageId())
                         .eq(AidingStudentsPersonManageDO::getStudentId, uploadVO.getStudentId()));
-        if(user1 != null){
+        if (user1 != null) {
             throw exception(STUDENT_INFO_EXISTS);
         }
         // 1.获取当前登录的用户表
         AidingStudentsPersonManageDO aDo = BeanUtils.toBean(uploadVO, AidingStudentsPersonManageDO.class);
-        AdminUserRespDTO user =  adminUserApi.getUser(getLoginUser().getId());
+        AdminUserRespDTO user = adminUserApi.getUser(getLoginUser().getId());
         Map map = aidingStudentsPersonManageMapper.getByStudentId(user.getStudentId());
         // 2.补充字段
         // 项目ID跟学院项目ID前端传
-        Long collegeId = deptApi.getCollegeId(user.getDeptId());
-        aDo.setCollegeId(collegeId);
         Map resultmap = aidingStudentsPersonManageMapper.getMajorById(map.get("SZZYM"));
-        aDo.setMajor((String) resultmap.get("ZYMC"));
-        aDo.setCollegeName((String) resultmap.get("DWMC"));
-        aDo.setGrade((String) map.get("SZNJ"));
-        aDo.setNickname(user.getNickname());
-        aDo.setStatus(0);
-
+        aDo.setCollegeId(deptApi.getCollegeId(user.getDeptId()))
+                .setMajor((String) resultmap.get("ZYMC"))
+                .setCollegeName((String) resultmap.get("DWMC"))
+                .setGrade((String) map.get("SZNJ"))
+                .setNickname(user.getNickname())
+                .setStatus(0);
         aidingStudentsPersonManageMapper.insert(aDo);
-
         String processInstanceId = processInstanceApi.createProcessInstance(user.getId(),
                 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
                         .setBusinessKey(String.valueOf(aDo.getId())));
@@ -176,10 +173,6 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
 
             }
         }
-        vo.setCollegeAll(allList.size());
-        vo.setCollegeAudit(wait);
-        vo.setCollegeEdit(edit);
-        vo.setCollegePass(pass);
         // 3.查看班级数量
         List<Map<String, Object>> maps = aidingStudentsPersonManageMapper
                 .countByClassName(pageReqVO);
@@ -188,8 +181,12 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
                 .selectList(new LambdaQueryWrapper<AidingStudentPersonManageEvaluationResultDO>()
                         .eq(AidingStudentPersonManageEvaluationResultDO::getCollegeManageId, pageReqVO.getCollegeManageId())
                         .eq(AidingStudentPersonManageEvaluationResultDO::getManageId, pageReqVO.getManageId()));
-        vo.setDoneEvaluationNumber(reviewList.size());
-        vo.setWaitingForEvaluationNumber(maps.size() - reviewList.size() );
+        vo.setCollegeAll(allList.size())
+                .setCollegeAudit(wait)
+                .setCollegeEdit(edit)
+                .setCollegePass(pass)
+                .setDoneEvaluationNumber(reviewList.size())
+        .setWaitingForEvaluationNumber(maps.size() - reviewList.size());
         // 3.2 统计各个班级完成的情况
         for (Map<String, Object> map : maps) {
             AidingStudentPersonManageClassVO classVo = new AidingStudentPersonManageClassVO();
@@ -212,11 +209,12 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
                 } else {
                 }
             }
-            classVo.setClassName((String) map.get("class_name"));
-            classVo.setClassAll(classList.size());
-            classVo.setClassAudit(wait);
-            classVo.setClassEdit(edit);
-            classVo.setClassPass(pass);
+            classVo
+                    .setClassName((String) map.get("class_name"))
+                    .setClassAll(classList.size())
+                    .setClassAudit(wait)
+                    .setClassEdit(edit)
+                    .setClassPass(pass);
             list.add(classVo);
         }
 
@@ -352,13 +350,16 @@ public class AidingStudentsPersonManageServiceImpl extends ServiceImpl<AidingStu
      */
     @Override
     public AidingStudentPersonManageInfoRespVO schoolauditAidingStudentsPersonManageData(Long id) {
+        // 1.获取申请表信息（）
         AidingStudentsPersonManageDO aDo = aidingStudentsPersonManageMapper.selectById(id);
-        AidingStudentPersonManageEvaluationResultDO aidingStudentPersonManageEvaluationResultDO = aidingStudentPersonManageEvaluationResultMapper
-                .selectOne(null,new LambdaQueryWrapper<AidingStudentsPersonManageDO>()
-                        .eq(AidingStudentsPersonManageDO::getClassName, aDo.getClassName()));
+        // 2.获取评议结果信息
+        AidingStudentPersonManageEvaluationResultDO EvaluationResultDO = aidingStudentPersonManageEvaluationResultMapper
+                .selectOne(new LambdaQueryWrapper<AidingStudentPersonManageEvaluationResultDO>()
+                        .eq(AidingStudentPersonManageEvaluationResultDO::getClassName, aDo.getClassName()));
+        // 3.整合
         AidingStudentPersonManageInfoRespVO vo = new AidingStudentPersonManageInfoRespVO();
-        vo = BeanUtils.toBean(aDo, AidingStudentPersonManageInfoRespVO.class);
-        vo = BeanUtils.toBean(aidingStudentPersonManageEvaluationResultDO, AidingStudentPersonManageInfoRespVO.class);
+        org.springframework.beans.BeanUtils.copyProperties(EvaluationResultDO, vo);
+        org.springframework.beans.BeanUtils.copyProperties(aDo, vo);
         return vo;
     }
 

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

@@ -1,8 +1,8 @@
-package cn.iocoder.yudao.module.as.service.financialaidstudentmange;
+package cn.iocoder.yudao.module.as.service.financialaidstudentmanage;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManagePageReqVO;
-import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManageRespVO;
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage.vo.FinancialAidStudentManagePageReqVO;
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage.vo.FinancialAidStudentManageRespVO;
 
 /**
  * @autor WoVoM

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

@@ -1,16 +1,13 @@
-package cn.iocoder.yudao.module.as.service.financialaidstudentmange;
+package cn.iocoder.yudao.module.as.service.financialaidstudentmanage;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.as.controller.admin.aidingstudentspersonmanage.vo.AidingStudentPersonManageInfoRespVO;
-import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManagePageReqVO;
-import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmange.vo.FinancialAidStudentManageRespVO;
-import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentsmanage.AidingStudentsManageDO;
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage.vo.FinancialAidStudentManagePageReqVO;
+import cn.iocoder.yudao.module.as.controller.admin.financialaidstudentmanage.vo.FinancialAidStudentManageRespVO;
 import cn.iocoder.yudao.module.as.dal.dataobject.aidingstudentspersonmanage.AidingStudentsPersonManageDO;
-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.dataobject.financialaidstudentmanage.FinancialAidStudentManageDO;
 import cn.iocoder.yudao.module.as.dal.mysql.aidingstudentspersonmanage.AidingStudentsPersonManageMapper;
-import cn.iocoder.yudao.module.as.dal.mysql.financialaidstudentmange.FinancialAidStudentManageMapper;
+import cn.iocoder.yudao.module.as.dal.mysql.financialaidstudentmanage.FinancialAidStudentManageMapper;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -103,5 +100,4 @@ public class FinancialAidStudentManageServiceImpl extends ServiceImpl<FinancialA
 
 
 
-
 }

yudao-module-as/yudao-module-as-biz/src/main/resources/mapper/financialaidstudentmanage/FinancialAidStudentManageMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.as.dal.mysql.financialaidstudentmanage.FinancialAidStudentManageMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>