diff --git a/backend/pom.xml b/backend/pom.xml
index 950c890a..66e4440d 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -407,6 +407,13 @@
${revision}
+
+
+ org.dromara
+ ruoyi-zsjy
+ ${revision}
+
+
-
+
org.dromara
ruoyi-jcbt
${revision}
-
+
diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/CwApprovalRecordMapper.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/CwApprovalRecordMapper.java
index 38fbd29e..89087eeb 100644
--- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/CwApprovalRecordMapper.java
+++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/mapper/CwApprovalRecordMapper.java
@@ -41,29 +41,30 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus selectPendingByApproverId(@Param("approverId") Long approverId, @Param("nodeStatus") String nodeStatus);
+ List selectPendingByApproverId(@Param("approverId") Long approverId,
+ @Param("nodeStatus") String nodeStatus);
/**
* 根据审批人ID和节点编码查询审批记录
*
* @param approverId 审批人ID
- * @param nodeCode 节点编码
+ * @param nodeCode 节点编码
* @param nodeStatus 节点状态
* @return 审批记录列表
*/
List selectByApproverAndNode(@Param("approverId") Long approverId,
- @Param("nodeCode") String nodeCode,
- @Param("nodeStatus") String nodeStatus);
+ @Param("nodeCode") String nodeCode,
+ @Param("nodeStatus") String nodeStatus);
/**
* 根据节点编码查询审批记录
*
- * @param nodeCode 节点编码
+ * @param nodeCode 节点编码
* @param nodeStatus 节点状态
* @return 审批记录列表
*/
List selectByNode(@Param("nodeCode") String nodeCode,
- @Param("nodeStatus") String nodeStatus);
+ @Param("nodeStatus") String nodeStatus);
/**
* 查询财务审批节点的待审批记录（包含waiting和pending状态）
@@ -91,11 +92,11 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus selectPageWithJoin(IPage page, @Param("bo") CwApprovalRecordBo bo);
@@ -140,4 +141,12 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus> selectAvailableApprovers();
+
}
diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
index f522adfd..84f2b634 100644
--- a/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-cw/src/main/java/org/dromara/cw/service/impl/CwApprovalRecordServiceImpl.java
@@ -37,7 +37,6 @@ import java.util.*;
import java.util.stream.Collectors;
import org.dromara.common.core.utils.SpringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
/**
* 审批记录Service业务层处理
@@ -56,9 +55,6 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
private final ISysUserService sysUserService;
private final ISysDeptService sysDeptService;
- @Autowired
- private JdbcTemplate jdbcTemplate;
-
/**
* 根据主键查询审批记录
*/
@@ -90,7 +86,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
*/
@Override
public TableDataInfo queryPageList(CwApprovalRecordBo bo, PageQuery pageQuery) {
- log.info("🔍 开始查询审批记录，查询参数：deptId={}, pageNum={}, pageSize={}", bo.getDeptId(), pageQuery.getPageNum(), pageQuery.getPageSize());
+ log.info("🔍 开始查询审批记录，查询参数：deptId={}, pageNum={}, pageSize={}", bo.getDeptId(), pageQuery.getPageNum(),
+ pageQuery.getPageSize());
// 🔧 使用新的关联查询方法（支持完整字段显示）
Page page = pageQuery.build();
@@ -167,7 +164,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
for (int i = 0; i < Math.min(result.getRecords().size(), 2); i++) {
CwApprovalRecordVo record = result.getRecords().get(i);
log.info("📋 记录{}详情：id={}, 申报编号={}, 项目名称={}, 申报人={}, 部门={}, 总投资={}, 当前审批人={}, 状态={}",
- i+1, record.getId(), record.getApplicationNo(), record.getProjectName(),
+ i + 1, record.getId(), record.getApplicationNo(), record.getProjectName(),
record.getApplicantName(), record.getDeptName(), record.getTotalInvestment(),
record.getCurrentApproverName(), record.getApprovalStatus());
}
@@ -196,7 +193,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
private LambdaQueryWrapper buildQueryWrapper(CwApprovalRecordBo bo) {
LambdaQueryWrapper lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getApplicationId() != null, CwApprovalRecord::getApplicationId, bo.getApplicationId());
- lqw.eq(StringUtils.isNotBlank(bo.getApplicationNo()), CwApprovalRecord::getApplicationNo, bo.getApplicationNo());
+ lqw.eq(StringUtils.isNotBlank(bo.getApplicationNo()), CwApprovalRecord::getApplicationNo,
+ bo.getApplicationNo());
lqw.eq(StringUtils.isNotBlank(bo.getNodeCode()), CwApprovalRecord::getNodeCode, bo.getNodeCode());
lqw.eq(StringUtils.isNotBlank(bo.getNodeStatus()), CwApprovalRecord::getNodeStatus, bo.getNodeStatus());
lqw.eq(bo.getApproverId() != null, CwApprovalRecord::getApproverId, bo.getApproverId());
@@ -212,7 +210,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
if (currentDeptId != null) {
// 查询该部门的项目申报ID列表
lqw.inSql(CwApprovalRecord::getApplicationId,
- "SELECT id FROM cw_project_application WHERE department_id = " + currentDeptId + " AND deleted = 0");
+ "SELECT id FROM cw_project_application WHERE department_id = " + currentDeptId
+ + " AND deleted = 0");
// 只显示部门审批节点的记录
lqw.eq(CwApprovalRecord::getNodeCode, "dept_approve");
@@ -234,7 +233,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
try {
Long deptId = Long.valueOf(bo.getDeptId());
lqw.in(CwApprovalRecord::getApplicationId,
- "SELECT id FROM cw_project_application WHERE department_id = " + deptId + " AND deleted = 0");
+ "SELECT id FROM cw_project_application WHERE department_id = " + deptId
+ + " AND deleted = 0");
} catch (NumberFormatException e) {
log.warn("无效的部门ID格式：{}", bo.getDeptId());
}
@@ -245,11 +245,11 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
// 其他查询条件 - 暂时注释掉，避免复杂的关联查询导致编译错误
// if (StringUtils.isNotBlank(bo.getProjectName())) {
- // // 项目名称查询需要关联查询，暂时跳过
+ // // 项目名称查询需要关联查询，暂时跳过
// }
// if (StringUtils.isNotBlank(bo.getApplicantName())) {
- // // 申报人姓名查询需要关联查询，暂时跳过
+ // // 申报人姓名查询需要关联查询，暂时跳过
// }
if (StringUtils.isNotBlank(bo.getApproverName())) {
@@ -304,8 +304,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
if (deptId != null) {
// 通过关联查询，只显示本部门用户提交的申报对应的审批记录
lqw.exists("SELECT 1 FROM cw_project_application a " +
- "WHERE a.id = cw_approval_record.application_id " +
- "AND a.department_id = " + deptId);
+ "WHERE a.id = cw_approval_record.application_id " +
+ "AND a.department_id = " + deptId);
// 🔧 关键修复：部门领导也需要过滤为自己作为审批人的记录
lqw.eq(CwApprovalRecord::getApproverId, currentUserId);
log.debug("部门领导权限过滤完成：deptId={}, approverId={}", deptId, currentUserId);
@@ -383,8 +383,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
// 查询当前用户已审批的记录（精确匹配已完成的状态）
LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(CwApprovalRecord::getApproverId, currentUserId)
- .in(CwApprovalRecord::getNodeStatus, Arrays.asList("approved", "rejected", "returned"))
- .orderByDesc(CwApprovalRecord::getEndTime);
+ .in(CwApprovalRecord::getNodeStatus, Arrays.asList("approved", "rejected", "returned"))
+ .orderByDesc(CwApprovalRecord::getEndTime);
return baseMapper.selectList(queryWrapper);
});
@@ -544,8 +544,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
@Override
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
public Boolean createApprovalProcess(Long applicationId, String applicationNo,
- Long currentUserId, String currentUserName,
- Long currentDeptId, String currentTenantId) {
+ Long currentUserId, String currentUserName,
+ Long currentDeptId, String currentTenantId) {
log.info("🚀 开始创建审批流程：applicationId={}, applicationNo={}", applicationId, applicationNo);
log.info("📋 使用用户上下文：userId={}, userName={}, deptId={}, tenantId={}",
currentUserId, currentUserName, currentDeptId, currentTenantId);
@@ -565,15 +565,15 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
log.error("❌ 申报记录不存在：applicationId={}", applicationId);
throw new RuntimeException("申报记录不存在");
}
- log.info("✅ 成功获取申报信息：projectName={}, status={}", application.getProjectName(), application.getApprovalStatus());
+ log.info("✅ 成功获取申报信息：projectName={}, status={}", application.getProjectName(),
+ application.getApprovalStatus());
// 🔧 重要修复：清理该申报的旧审批记录（避免重复数据）
log.info("🧹 开始清理申报ID={}的旧审批记录...", applicationId);
try {
int deletedCount = baseMapper.delete(
- Wrappers.lambdaQuery()
- .eq(CwApprovalRecord::getApplicationId, applicationId)
- );
+ Wrappers.lambdaQuery()
+ .eq(CwApprovalRecord::getApplicationId, applicationId));
log.info("✅ 清理旧审批记录完成：删除{}条记录", deletedCount);
} catch (Exception e) {
log.error("❌ 清理旧审批记录失败：applicationId={}, error={}", applicationId, e.getMessage(), e);
@@ -587,8 +587,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
// 第1节点：部门审批（提交时只创建这一个记录）
CwApprovalRecord deptRecord = createApprovalRecord(applicationId, applicationNo,
- "dept_approve", "部门审批", 1, "waiting",
- currentUserId, currentUserName, currentDeptId, currentTenantId);
+ "dept_approve", "部门审批", 1, "waiting",
+ currentUserId, currentUserName, currentDeptId, currentTenantId);
records.add(deptRecord);
log.info("✅ 创建部门审批记录：ID={}, 审批人={}", deptRecord.getId(), deptRecord.getApproverName());
@@ -602,8 +602,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
for (int i = 0; i < records.size(); i++) {
CwApprovalRecord record = records.get(i);
log.info("📋 记录{}详情: ID={}, ApplicationId={}, NodeCode={}, ApproverId={}, CreateBy={}, TenantId={}",
- i+1, record.getId(), record.getApplicationId(), record.getNodeCode(),
- record.getApproverId(), record.getCreateBy(), record.getTenantId());
+ i + 1, record.getId(), record.getApplicationId(), record.getNodeCode(),
+ record.getApproverId(), record.getCreateBy(), record.getTenantId());
}
// 批量插入审批记录
@@ -626,11 +626,10 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
try {
// 直接使用Mapper在当前事务中更新，避免调用Service层的新事务
int updateCount = applicationMapper.update(null,
- Wrappers.lambdaUpdate()
- .set(CwProjectApplication::getApprovalStatus, "approving")
- .set(CwProjectApplication::getUpdateTime, new Date())
- .eq(CwProjectApplication::getId, applicationId)
- );
+ Wrappers.lambdaUpdate()
+ .set(CwProjectApplication::getApprovalStatus, "approving")
+ .set(CwProjectApplication::getUpdateTime, new Date())
+ .eq(CwProjectApplication::getId, applicationId));
if (updateCount > 0) {
log.info("✅ 申报状态直接更新成功：applicationId={} -> approving, 影响行数={}", applicationId, updateCount);
@@ -673,10 +672,10 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
}
private CwApprovalRecord createApprovalRecord(Long applicationId, String applicationNo,
- String nodeCode, String nodeName,
- Integer nodeOrder, String nodeStatus,
- Long currentUserId, String currentUserName,
- Long currentDeptId, String currentTenantId) {
+ String nodeCode, String nodeName,
+ Integer nodeOrder, String nodeStatus,
+ Long currentUserId, String currentUserName,
+ Long currentDeptId, String currentTenantId) {
CwApprovalRecord record = new CwApprovalRecord();
// 生成唯一ID（批量插入需要手动生成）
@@ -709,7 +708,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
record.setCreateDept(currentDeptId);
record.setTenantId(currentTenantId);
- // 设置其他必需字段（为批量插入提供完整数据）
+ // 设置其他必需字段（为批量插入提供完整数据）
record.setIsDelegate(false);
record.setIsOvertime(false);
@@ -748,7 +747,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
* 根据节点类型设置审批人
*/
private void setApproverByNodeCode(CwApprovalRecord record, String nodeCode,
- Long currentUserId, String currentUserName) {
+ Long currentUserId, String currentUserName) {
// 根据审批节点类型查找正确的审批人，而不是使用申报人
try {
switch (nodeCode) {
@@ -875,12 +874,12 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
try {
// SQL查询：查找该部门内具有project_dept_manage角色的用户
String sql = "SELECT ur.user_id FROM sys_user_role ur " +
- "INNER JOIN sys_role r ON ur.role_id = r.role_id " +
- "INNER JOIN sys_user u ON ur.user_id = u.user_id " +
- "WHERE r.role_key = 'project_dept_manage' " +
- "AND u.dept_id = " + deptId + " " +
- "AND u.del_flag = 0 AND u.status = 0 " +
- "LIMIT 1";
+ "INNER JOIN sys_role r ON ur.role_id = r.role_id " +
+ "INNER JOIN sys_user u ON ur.user_id = u.user_id " +
+ "WHERE r.role_key = 'project_dept_manage' " +
+ "AND u.dept_id = " + deptId + " " +
+ "AND u.del_flag = 0 AND u.status = 0 " +
+ "LIMIT 1";
log.info("查找部门审批人SQL：{}", sql);
@@ -958,8 +957,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
// 更新当前审批记录
CwApprovalRecordBo updateBo = new CwApprovalRecordBo();
updateBo.setId(currentRecord.getId());
- updateBo.setNodeStatus("approve".equals(approveAction) ? "approved" :
- "reject".equals(approveAction) ? "rejected" : "returned");
+ updateBo.setNodeStatus("approve".equals(approveAction) ? "approved"
+ : "reject".equals(approveAction) ? "rejected" : "returned");
updateBo.setApproveAction(approveAction);
updateBo.setApproveOpinion(approveOpinion);
updateBo.setEndTime(new Date());
@@ -974,7 +973,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
} catch (Exception e) {
log.error("处理审批失败：applicationId={}, nodeCode={}, error={}",
- applicationId, nodeCode, e.getMessage(), e);
+ applicationId, nodeCode, e.getMessage(), e);
throw new RuntimeException("处理审批失败：" + e.getMessage(), e);
}
}
@@ -1020,8 +1019,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
// 根据节点类型创建对应的审批记录
CwApprovalRecord newRecord = createApprovalRecordForNode(applicationId, application.getApplicationNo(),
- nextNodeCode, application.getCreateBy(), application.getApplicantName(),
- application.getDepartmentId(), LoginHelper.getTenantId());
+ nextNodeCode, application.getCreateBy(), application.getApplicantName(),
+ application.getDepartmentId(), LoginHelper.getTenantId());
if (newRecord != null) {
// 插入新的审批记录
@@ -1046,7 +1045,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
return true;
} catch (Exception e) {
log.error("启动下一个审批节点失败：applicationId={}, nodeCode={}, error={}",
- applicationId, nextNodeCode, e.getMessage(), e);
+ applicationId, nextNodeCode, e.getMessage(), e);
throw new RuntimeException("启动下一个审批节点失败：" + e.getMessage());
}
}
@@ -1055,8 +1054,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
* 动态创建指定节点的审批记录
*/
private CwApprovalRecord createApprovalRecordForNode(Long applicationId, String applicationNo,
- String nodeCode, Long createBy, String createByName,
- Long deptId, String tenantId) {
+ String nodeCode, Long createBy, String createByName,
+ Long deptId, String tenantId) {
try {
String nodeName;
Integer nodeOrder;
@@ -1077,11 +1076,11 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
// 创建审批记录
CwApprovalRecord record = createApprovalRecord(applicationId, applicationNo,
- nodeCode, nodeName, nodeOrder, "waiting",
- createBy, createByName, deptId, tenantId);
+ nodeCode, nodeName, nodeOrder, "waiting",
+ createBy, createByName, deptId, tenantId);
log.info("✅ 动态创建审批记录：nodeCode={}, nodeName={}, approverId={}",
- nodeCode, nodeName, record.getApproverId());
+ nodeCode, nodeName, record.getApproverId());
return record;
} catch (Exception e) {
@@ -1124,7 +1123,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
return checkApprovalPermission(applicationId, "dept_approve");
}
- /**
+ /**
* 获取可选审批人列表（院领导）
* 修改为基于权限角色查找：查找具有cw:approval:leader权限的用户
*/
@@ -1135,46 +1134,22 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
List> approvers = new ArrayList<>();
try {
- // 使用原生SQL查询具有cw:approval:leader权限的用户
- String sql = """
- SELECT DISTINCT
- u.user_id,
- u.user_name,
- u.nick_name,
- COALESCE(d.dept_name, '未分配部门') as dept_name,
- COALESCE(d.dept_id, 0) as dept_id
- FROM sys_user u
- LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
- INNER JOIN sys_user_role ur ON u.user_id = ur.user_id
- INNER JOIN sys_role r ON ur.role_id = r.role_id
- INNER JOIN sys_role_menu rm ON r.role_id = rm.role_id
- INNER JOIN sys_menu m ON rm.menu_id = m.menu_id
- WHERE m.perms = 'cw:approval:leader'
- AND u.status = '0'
- AND u.del_flag = '0'
- AND r.status = '0'
- ORDER BY u.user_name
- """;
+ // 🔧 使用Mapper方法查询具有cw:approval:leader权限的用户
+ log.info("执行Mapper查询查找具有cw:approval:leader权限的用户");
- log.info("执行权限查询SQL查找具有cw:approval:leader权限的用户");
+ // 直接调用Mapper方法，不需要手动转换结果
+ List> results = baseMapper.selectAvailableApprovers();
- // 执行SQL查询
- List> results = jdbcTemplate.queryForList(sql);
+ log.info("Mapper查询结果：找到 {} 个具有院领导审批权限的用户", results.size());
- log.info("SQL查询结果：找到 {} 个具有院领导审批权限的用户", results.size());
-
- // 转换查询结果为返回格式
- for (Map row : results) {
- Map approver = new HashMap<>();
- approver.put("userId", row.get("user_id"));
- approver.put("userName", row.get("user_name"));
- approver.put("nickName", row.get("nick_name"));
- approver.put("deptName", row.get("dept_name"));
- approver.put("deptId", row.get("dept_id"));
- approvers.add(approver);
+ // 直接使用查询结果，Mapper已经处理了字段映射
+ approvers.addAll(results);
+ // 记录查询到的审批人信息
+ for (Map approver : approvers) {
log.info("添加院领导审批人: userId={}, userName={}, nickName={}, deptName={}",
- row.get("user_id"), row.get("user_name"), row.get("nick_name"), row.get("dept_name"));
+ approver.get("userId"), approver.get("userName"), approver.get("nickName"),
+ approver.get("deptName"));
}
// 如果基于权限查询没有找到用户，使用原有的部门查询作为备选方案
@@ -1230,11 +1205,10 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
// 1. 查找当前用户的待审批记录
CwApprovalRecord currentRecord = baseMapper.selectOne(
- Wrappers.lambdaQuery(CwApprovalRecord.class)
- .eq(CwApprovalRecord::getApplicationId, applicationId)
- .eq(CwApprovalRecord::getApproverId, currentUserId)
- .eq(CwApprovalRecord::getNodeStatus, "waiting")
- );
+ Wrappers.lambdaQuery(CwApprovalRecord.class)
+ .eq(CwApprovalRecord::getApplicationId, applicationId)
+ .eq(CwApprovalRecord::getApproverId, currentUserId)
+ .eq(CwApprovalRecord::getNodeStatus, "waiting"));
if (currentRecord == null) {
throw new RuntimeException("未找到待审批记录或您没有审批权限");
@@ -1263,7 +1237,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
throw new RuntimeException("更新审批记录失败");
}
- // 3. 更新项目申请状态
+ // 3. 更新项目申请状态
String newStatus;
if ("approve".equals(approveAction)) {
// 分管领导审批通过，整个审批流程完成
@@ -1292,7 +1266,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void financeApproval(Long applicationId, String approveAction, String approveOpinion, Long selectedApproverId) {
+ public void financeApproval(Long applicationId, String approveAction, String approveOpinion,
+ Long selectedApproverId) {
Long currentUserId = LoginHelper.getUserId();
log.info("🔍 财务审批开始：applicationId={}, userId={}, action={}, selectedApproverId={}",
applicationId, currentUserId, approveAction, selectedApproverId);
@@ -1306,24 +1281,22 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
log.info("🔍 查询财务审批记录：applicationId={}, nodeCode=finance_approve, nodeStatus=waiting", applicationId);
List records = baseMapper.selectList(
- Wrappers.lambdaQuery(CwApprovalRecord.class)
- .eq(CwApprovalRecord::getApplicationId, applicationId)
- .eq(CwApprovalRecord::getNodeCode, "finance_approve")
- .eq(CwApprovalRecord::getNodeStatus, "waiting")
- .orderByDesc(CwApprovalRecord::getCreateTime)
- );
+ Wrappers.lambdaQuery(CwApprovalRecord.class)
+ .eq(CwApprovalRecord::getApplicationId, applicationId)
+ .eq(CwApprovalRecord::getNodeCode, "finance_approve")
+ .eq(CwApprovalRecord::getNodeStatus, "waiting")
+ .orderByDesc(CwApprovalRecord::getCreateTime));
if (records.isEmpty()) {
log.error("❌ 未找到财务审批记录：applicationId={}", applicationId);
// 查询所有相关记录用于调试
List allRecords = baseMapper.selectList(
- Wrappers.lambdaQuery(CwApprovalRecord.class)
- .eq(CwApprovalRecord::getApplicationId, applicationId)
- );
+ Wrappers.lambdaQuery(CwApprovalRecord.class)
+ .eq(CwApprovalRecord::getApplicationId, applicationId));
log.error("📋 该申请的所有审批记录：{}", allRecords.size());
for (CwApprovalRecord record : allRecords) {
log.error("📋 记录详情：nodeCode={}, nodeStatus={}, approverId={}",
- record.getNodeCode(), record.getNodeStatus(), record.getApproverId());
+ record.getNodeCode(), record.getNodeStatus(), record.getApproverId());
}
throw new RuntimeException("未找到待审批记录或该申请已被处理");
}
@@ -1335,7 +1308,8 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
}
log.info("✅ 找到财务审批记录：recordId={}, nodeCode={}, nodeStatus={}, approverId={}",
- currentRecord.getId(), currentRecord.getNodeCode(), currentRecord.getNodeStatus(), currentRecord.getApproverId());
+ currentRecord.getId(), currentRecord.getNodeCode(), currentRecord.getNodeStatus(),
+ currentRecord.getApproverId());
// 3. 更新当前审批记录
Date now = new Date();
@@ -1392,23 +1366,21 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
private void updateLeaderApproverAndStart(Long applicationId, Long selectedApproverId) {
// 1. 查找分管领导审批记录（先按waiting状态查找）
CwApprovalRecord leaderRecord = baseMapper.selectOne(
- Wrappers.lambdaQuery(CwApprovalRecord.class)
- .eq(CwApprovalRecord::getApplicationId, applicationId)
- .eq(CwApprovalRecord::getNodeCode, "leader_approve")
- .eq(CwApprovalRecord::getNodeStatus, "waiting")
- );
+ Wrappers.lambdaQuery(CwApprovalRecord.class)
+ .eq(CwApprovalRecord::getApplicationId, applicationId)
+ .eq(CwApprovalRecord::getNodeCode, "leader_approve")
+ .eq(CwApprovalRecord::getNodeStatus, "waiting"));
// 2. 如果waiting状态未找到，尝试查找pending状态（兼容处理）
if (leaderRecord == null) {
leaderRecord = baseMapper.selectOne(
- Wrappers.lambdaQuery(CwApprovalRecord.class)
- .eq(CwApprovalRecord::getApplicationId, applicationId)
- .eq(CwApprovalRecord::getNodeCode, "leader_approve")
- .eq(CwApprovalRecord::getNodeStatus, "pending")
- );
+ Wrappers.lambdaQuery(CwApprovalRecord.class)
+ .eq(CwApprovalRecord::getApplicationId, applicationId)
+ .eq(CwApprovalRecord::getNodeCode, "leader_approve")
+ .eq(CwApprovalRecord::getNodeStatus, "pending"));
}
- // 3. 如果仍未找到，动态创建分管领导审批记录
+ // 3. 如果仍未找到，动态创建分管领导审批记录
if (leaderRecord == null) {
log.warn("未找到分管领导审批记录，开始动态创建：applicationId={}", applicationId);
@@ -1426,17 +1398,16 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
// 创建分管领导审批记录
leaderRecord = createApprovalRecord(
- applicationId,
- applicationVo.getApplicationNo(),
- "leader_approve",
- "分管领导审批",
- 3, // leader_approve 节点顺序
- "waiting",
- currentUserId,
- currentUserName,
- currentDeptId,
- currentTenantId
- );
+ applicationId,
+ applicationVo.getApplicationNo(),
+ "leader_approve",
+ "分管领导审批",
+ 3, // leader_approve 节点顺序
+ "waiting",
+ currentUserId,
+ currentUserName,
+ currentDeptId,
+ currentTenantId);
// 保存到数据库
int result = baseMapper.insert(leaderRecord);
@@ -1447,7 +1418,7 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
log.info("✅ 动态创建分管领导审批记录成功：recordId={}", leaderRecord.getId());
}
- // 2. 获取选择的院领导信息
+ // 2. 获取选择的院领导信息
try {
SysUserVo selectedUser = sysUserService.selectUserById(selectedApproverId);
if (selectedUser == null) {
@@ -1470,12 +1441,12 @@ public class CwApprovalRecordServiceImpl implements ICwApprovalRecordService {
throw new RuntimeException("更新分管领导审批记录失败");
}
- log.info("✅ 成功指定院领导审批人：userId={}, userName={}",
+ log.info("✅ 成功指定院领导审批人：userId={}, userName={}",
selectedApproverId, selectedUser.getUserName());
} catch (Exception e) {
log.error("❌ 更新分管领导审批人失败：applicationId={}, selectedApproverId={}, error={}",
- applicationId, selectedApproverId, e.getMessage(), e);
+ applicationId, selectedApproverId, e.getMessage(), e);
throw new RuntimeException("指定院领导审批人失败：" + e.getMessage());
}
}
diff --git a/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml b/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml
index 22f49bc6..11e1c691 100644
--- a/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml
+++ b/backend/ruoyi-modules/ruoyi-cw/src/main/resources/mapper/CwApprovalRecordMapper.xml
@@ -234,4 +234,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY ar.create_time DESC
+
+
+
diff --git a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java
index 721b4798..fbf380e7 100644
--- a/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java
+++ b/backend/ruoyi-modules/ruoyi-jcbt/src/main/java/org/dromara/jcbt/service/impl/JcbtScholarshipApplicationServiceImpl.java
@@ -70,6 +70,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 查询奖学金申请记录详情
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public JcbtScholarshipApplicationVo queryById(Long id) {
return baseMapper.selectByIdWithRelations(id);
}
@@ -78,10 +79,13 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 查询奖学金申请记录分页列表
*/
@Override
- public TableDataInfo queryPageList(JcbtScholarshipApplicationBo bo, PageQuery pageQuery) {
+ @Transactional(rollbackFor = Exception.class)
+ public TableDataInfo queryPageList(JcbtScholarshipApplicationBo bo,
+ PageQuery pageQuery) {
LambdaQueryWrapper lqw = buildQueryWrapper(bo);
// 使用自定义分页查询（包含关联表信息）
- Page result = baseMapper.selectJcbtScholarshipApplicationPage(pageQuery.build(), lqw);
+ Page result = baseMapper.selectJcbtScholarshipApplicationPage(pageQuery.build(),
+ lqw);
return TableDataInfo.build(result);
}
@@ -89,6 +93,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 查询奖学金申请记录列表
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public List queryList(JcbtScholarshipApplicationBo bo) {
LambdaQueryWrapper lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
@@ -98,18 +103,21 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
Map params = bo.getParams();
LambdaQueryWrapper lqw = Wrappers.lambdaQuery();
lqw.eq(ObjectUtil.isNotNull(bo.getBatchId()), JcbtScholarshipApplication::getBatchId, bo.getBatchId());
- lqw.eq(ObjectUtil.isNotNull(bo.getScholarshipTypeId()), JcbtScholarshipApplication::getScholarshipTypeId, bo.getScholarshipTypeId());
+ lqw.eq(ObjectUtil.isNotNull(bo.getScholarshipTypeId()), JcbtScholarshipApplication::getScholarshipTypeId,
+ bo.getScholarshipTypeId());
lqw.eq(StringUtils.isNotBlank(bo.getStudentNo()), JcbtScholarshipApplication::getStudentNo, bo.getStudentNo());
- lqw.like(StringUtils.isNotBlank(bo.getStudentName()), JcbtScholarshipApplication::getStudentName, bo.getStudentName());
+ lqw.like(StringUtils.isNotBlank(bo.getStudentName()), JcbtScholarshipApplication::getStudentName,
+ bo.getStudentName());
lqw.eq(ObjectUtil.isNotNull(bo.getStudentId()), JcbtScholarshipApplication::getStudentId, bo.getStudentId());
lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), JcbtScholarshipApplication::getDeptId, bo.getDeptId());
lqw.eq(ObjectUtil.isNotNull(bo.getClassId()), JcbtScholarshipApplication::getClassId, bo.getClassId());
// 已删除 applicantType 和 applicantId 字段
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), JcbtScholarshipApplication::getCurrentStatus, bo.getStatus());
// 支持前端 applicationStatus 查询参数
- lqw.eq(StringUtils.isNotBlank(bo.getApplicationStatus()), JcbtScholarshipApplication::getCurrentStatus, bo.getApplicationStatus());
+ lqw.eq(StringUtils.isNotBlank(bo.getApplicationStatus()), JcbtScholarshipApplication::getCurrentStatus,
+ bo.getApplicationStatus());
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
- JcbtScholarshipApplication::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+ JcbtScholarshipApplication::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
// 注意：排序在XML中处理，避免SQL语法错误
// lqw.orderByDesc(JcbtScholarshipApplication::getCreateTime);
return lqw;
@@ -122,7 +130,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(JcbtScholarshipApplicationBo bo) {
// 检查申请资格
- Map eligibilityCheck = checkStudentEligibility(bo.getStudentId(), bo.getBatchId(), bo.getScholarshipTypeId());
+ Map eligibilityCheck = checkStudentEligibility(bo.getStudentId(), bo.getBatchId(),
+ bo.getScholarshipTypeId());
if (!(Boolean) eligibilityCheck.get("eligible")) {
throw new RuntimeException((String) eligibilityCheck.get("message"));
}
@@ -254,15 +263,14 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean batchSubmitApplicationsByTeacher(Long batchId, Long scholarshipTypeId, Long classId,
- List studentApplications) {
+ List studentApplications) {
// 检查班级名额 - 使用和前端一致的查询方法
log.info("开始检查班级名额 - 批次ID: {}, 奖学金类型ID: {}, 班级ID: {}, 申请人数: {}",
batchId, scholarshipTypeId, classId, studentApplications.size());
// 使用和前端getScholarshipTypesWithQuota一致的查询方法
JcbtScholarshipQuotaVo classQuota = quotaService.selectClassQuota(classId, scholarshipTypeId, batchId);
- log.info("班级名额查询结果: {}", classQuota != null ?
- String.format("ID=%s, 总名额=%s, 已用=%s, 可用=%s, 状态=%s",
+ log.info("班级名额查询结果: {}", classQuota != null ? String.format("ID=%s, 总名额=%s, 已用=%s, 可用=%s, 状态=%s",
classQuota.getId(), classQuota.getTotalQuota(), classQuota.getUsedQuota(),
classQuota.getAvailableQuota(), classQuota.getStatus()) : "null");
@@ -306,7 +314,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
if (classQuota != null) {
// 有班级名额分配，更新班级名额
log.info("更新班级名额使用情况 - ID: {}, 原已用: {}, 原可用: {}, 新增申请: {}",
- classQuota.getId(), classQuota.getUsedQuota(), classQuota.getAvailableQuota(), studentApplications.size());
+ classQuota.getId(), classQuota.getUsedQuota(), classQuota.getAvailableQuota(),
+ studentApplications.size());
// 注意：这里需要调用全校名额表的更新方法，而不是班级名额表的方法
quotaService.updateQuotaUsage(classQuota.getId(), studentApplications.size());
@@ -334,6 +343,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 查询班主任负责班级的申请记录
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public List queryApplicationsByApplicant(Long applicantId, Long batchId) {
// TODO: 重新设计查询逻辑，因为applicantId字段已删除
// 可能需要通过班级ID或其他方式查询班主任负责的申请记录
@@ -344,6 +354,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 查询班级的申请记录
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public List queryApplicationsByClass(Long classId, Long batchId) {
return baseMapper.selectApplicationsByClass(classId, batchId);
}
@@ -352,6 +363,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 查询待审核的申请记录
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public List queryPendingApplications(Long reviewerId, String status) {
return baseMapper.selectPendingApplications(reviewerId, status);
}
@@ -360,6 +372,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 检查学生申请资格和限制
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map checkStudentEligibility(Long studentId, Long batchId, Long scholarshipTypeId) {
Map result = new HashMap<>();
@@ -383,7 +396,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean batchReviewApplications(List applicationIds, String status, Long reviewerId,
- String reviewerName, String reviewComment) {
+ String reviewerName, String reviewComment) {
return baseMapper.batchUpdateStatus(applicationIds, status, reviewerId, reviewerName, reviewComment) > 0;
}
@@ -429,6 +442,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 获取申请统计数据
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map getApplicationStatistics(Long batchId, Long deptId) {
List statistics = baseMapper.selectApplicationStatistics(batchId, deptId);
@@ -443,6 +457,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 查询可申请的奖学金类型列表
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public List> queryAvailableScholarshipTypes(Long classId, Long batchId) {
// 查询该班级在该批次的名额分配情况
List quotas = classQuotaService.queryQuotasByClass(classId, batchId);
@@ -466,6 +481,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 获取班级名额使用情况
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map getClassQuotaUsage(Long classId, Long batchId) {
List quotas = classQuotaService.queryQuotasByClass(classId, batchId);
@@ -485,7 +501,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
// ========== 班主任申请专用接口实现 ==========
- /**
+ /**
* 根据班主任用户ID获取完整的班级信息
* 自包含方法，避免跨模块调用，直接使用SQL查询
*/
@@ -493,26 +509,26 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
try {
// 使用自定义SQL一次性关联查询所有需要的信息
String sql = """
- SELECT
- cm.id as class_id,
- cm.class_name,
- cm.class_code,
- cm.grade,
- cm.college_id,
- cm.college_name,
- cm.major_id,
- cm.major_name,
- cm.class_teacher_id,
- cm.class_teacher_name,
- cm.current_student_count,
- cm.class_status,
- cm.class_type
- FROM xg_class_msg cm
- WHERE cm.class_teacher_id = ?
- AND cm.deleted = 0
- AND cm.class_status = '1'
- ORDER BY cm.grade DESC, cm.class_name ASC
- """;
+ SELECT
+ cm.id as class_id,
+ cm.class_name,
+ cm.class_code,
+ cm.grade,
+ cm.college_id,
+ cm.college_name,
+ cm.major_id,
+ cm.major_name,
+ cm.class_teacher_id,
+ cm.class_teacher_name,
+ cm.current_student_count,
+ cm.class_status,
+ cm.class_type
+ FROM xg_class_msg cm
+ WHERE cm.class_teacher_id = ?
+ AND cm.deleted = 0
+ AND cm.class_status = '1'
+ ORDER BY cm.grade DESC, cm.class_name ASC
+ """;
// 执行查询
List> result = jdbcTemplate.queryForList(sql, teacherId);
@@ -530,6 +546,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 重构后的获取班级信息方法 - 自包含，无跨模块依赖
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map getClassInfoByTeacher(Long userId) {
Map result = new HashMap<>();
@@ -582,8 +599,9 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
/**
* 从Map构建班级结果信息
*/
- private void buildClassResultFromMap(Map result, Long teacherId, String teacherName, Map classInfo) {
- result.put("teacherId", teacherId.toString());
+ private void buildClassResultFromMap(Map result, Long teacherId, String teacherName,
+ Map classInfo) {
+ result.put("teacherId", teacherId.toString());
result.put("teacherName", teacherName);
result.put("classId", classInfo.get("class_id") != null ? classInfo.get("class_id").toString() : "");
result.put("className", (String) classInfo.get("class_name"));
@@ -613,36 +631,37 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
return option;
}
- /**
+ /**
* 确认选择班级（当用户从多个班级中选择一个时调用）
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map confirmClassSelection(Long teacherId, Long classId) {
Map result = new HashMap<>();
try {
// 验证该班级确实属于该老师 - 使用自包含查询
String sql = """
- SELECT
- cm.id as class_id,
- cm.class_name,
- cm.class_code,
- cm.grade,
- cm.college_id,
- cm.college_name,
- cm.major_id,
- cm.major_name,
- cm.class_teacher_id,
- cm.class_teacher_name,
- cm.current_student_count,
- cm.class_status,
- cm.class_type
- FROM xg_class_msg cm
- WHERE cm.class_teacher_id = ?
- AND cm.id = ?
- AND cm.deleted = 0
- AND cm.class_status = '1'
- """;
+ SELECT
+ cm.id as class_id,
+ cm.class_name,
+ cm.class_code,
+ cm.grade,
+ cm.college_id,
+ cm.college_name,
+ cm.major_id,
+ cm.major_name,
+ cm.class_teacher_id,
+ cm.class_teacher_name,
+ cm.current_student_count,
+ cm.class_status,
+ cm.class_type
+ FROM xg_class_msg cm
+ WHERE cm.class_teacher_id = ?
+ AND cm.id = ?
+ AND cm.deleted = 0
+ AND cm.class_status = '1'
+ """;
List> classList = jdbcTemplate.queryForList(sql, teacherId, classId);
@@ -663,38 +682,39 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
}
}
- /**
+ /**
* 获取班级学生列表（用于勾选）- 使用自包含查询
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public List> getClassStudents(Long classId) {
List> students = new ArrayList<>();
try {
// 使用自包含查询获取学生列表，关联班级表获取学院和专业信息
String sql = """
- SELECT
- sm.id,
- sm.student_no,
- sm.name,
- sm.gender,
- sm.phone,
- sm.email,
- sm.student_status,
- cm.college_id,
- cm.college_name,
- cm.major_id,
- cm.major_name,
- cm.class_name,
- cm.grade
- FROM xg_student_msg sm
- LEFT JOIN xg_class_msg cm ON sm.class_id = cm.id
- WHERE sm.class_id = ?
- AND sm.deleted = 0
- AND sm.student_status = '1'
- AND (cm.deleted IS NULL OR cm.deleted = 0)
- ORDER BY sm.student_no ASC
- """;
+ SELECT
+ sm.id,
+ sm.student_no,
+ sm.name,
+ sm.gender,
+ sm.phone,
+ sm.email,
+ sm.student_status,
+ cm.college_id,
+ cm.college_name,
+ cm.major_id,
+ cm.major_name,
+ cm.class_name,
+ cm.grade
+ FROM xg_student_msg sm
+ LEFT JOIN xg_class_msg cm ON sm.class_id = cm.id
+ WHERE sm.class_id = ?
+ AND sm.deleted = 0
+ AND sm.student_status = '1'
+ AND (cm.deleted IS NULL OR cm.deleted = 0)
+ ORDER BY sm.student_no ASC
+ """;
List> studentList = jdbcTemplate.queryForList(sql, classId);
@@ -702,7 +722,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
for (Map student : studentList) {
Map studentMap = new HashMap<>();
studentMap.put("id", student.get("id"));
- studentMap.put("studentCode", student.get("student_no") != null ? student.get("student_no").toString() : "");
+ studentMap.put("studentCode",
+ student.get("student_no") != null ? student.get("student_no").toString() : "");
studentMap.put("studentName", student.get("name") != null ? student.get("name").toString() : "");
// 性别转换：0-男，1-女
@@ -715,14 +736,20 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
studentMap.put("phone", student.get("phone") != null ? student.get("phone").toString() : "");
studentMap.put("email", student.get("email") != null ? student.get("email").toString() : "");
- studentMap.put("status", student.get("student_status") != null ? student.get("student_status").toString() : "1");
+ studentMap.put("status",
+ student.get("student_status") != null ? student.get("student_status").toString() : "1");
// 添加学院和专业信息
- studentMap.put("collegeId", student.get("college_id") != null ? student.get("college_id").toString() : "");
- studentMap.put("collegeName", student.get("college_name") != null ? student.get("college_name").toString() : "");
- studentMap.put("majorId", student.get("major_id") != null ? student.get("major_id").toString() : "");
- studentMap.put("majorName", student.get("major_name") != null ? student.get("major_name").toString() : "");
- studentMap.put("className", student.get("class_name") != null ? student.get("class_name").toString() : "");
+ studentMap.put("collegeId",
+ student.get("college_id") != null ? student.get("college_id").toString() : "");
+ studentMap.put("collegeName",
+ student.get("college_name") != null ? student.get("college_name").toString() : "");
+ studentMap.put("majorId",
+ student.get("major_id") != null ? student.get("major_id").toString() : "");
+ studentMap.put("majorName",
+ student.get("major_name") != null ? student.get("major_name").toString() : "");
+ studentMap.put("className",
+ student.get("class_name") != null ? student.get("class_name").toString() : "");
studentMap.put("grade", student.get("grade") != null ? student.get("grade").toString() : "");
students.add(studentMap);
@@ -739,10 +766,11 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
}
}
- /**
+ /**
* 根据批次获取可申请的奖学金类型
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public List> getScholarshipTypesByBatch(Long batchId) {
List> scholarshipTypes = new ArrayList<>();
@@ -752,21 +780,24 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
if (batchTypeIds != null && !batchTypeIds.isEmpty()) {
for (Long scholarshipTypeId : batchTypeIds) {
- // 查询奖学金类型基本信息
- JcbtScholarshipTypeVo typeInfo = scholarshipTypeService.queryById(scholarshipTypeId);
+ // 查询奖学金类型基本信息
+ JcbtScholarshipTypeVo typeInfo = scholarshipTypeService.queryById(scholarshipTypeId);
if (typeInfo != null && typeInfo.getStatus() == 1) { // 只返回启用的类型
- Map scholarshipType = new HashMap<>();
- scholarshipType.put("id", scholarshipTypeId);
- scholarshipType.put("name", typeInfo.getTypeName());
- scholarshipType.put("amount", typeInfo.getAwardAmount());
- scholarshipType.put("description", typeInfo.getDescription());
- scholarshipType.put("typeCategory", typeInfo.getTypeCategory());
- scholarshipType.put("levelType", typeInfo.getLevelType());
+ Map scholarshipType = new HashMap<>();
+ scholarshipType.put("id", scholarshipTypeId);
+ scholarshipType.put("name", typeInfo.getTypeName());
+ scholarshipType.put("amount", typeInfo.getAwardAmount());
+ scholarshipType.put("description", typeInfo.getDescription());
+ scholarshipType.put("typeCategory", typeInfo.getTypeCategory());
+ scholarshipType.put("levelType", typeInfo.getLevelType());
// 查询该类型在该批次下的名额统计信息
- List quotaList = quotaService.queryListByBatchAndType(batchId, scholarshipTypeId);
- int totalQuota = quotaList.stream().mapToInt(q -> q.getTotalQuota() != null ? q.getTotalQuota() : 0).sum();
- int usedQuota = quotaList.stream().mapToInt(q -> q.getUsedQuota() != null ? q.getUsedQuota() : 0).sum();
+ List quotaList = quotaService.queryListByBatchAndType(batchId,
+ scholarshipTypeId);
+ int totalQuota = quotaList.stream()
+ .mapToInt(q -> q.getTotalQuota() != null ? q.getTotalQuota() : 0).sum();
+ int usedQuota = quotaList.stream()
+ .mapToInt(q -> q.getUsedQuota() != null ? q.getUsedQuota() : 0).sum();
int availableQuota = totalQuota - usedQuota;
scholarshipType.put("totalQuota", totalQuota);
@@ -805,6 +836,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 根据批次和班级获取带名额信息的奖学金类型（班主任专用）
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public List> getScholarshipTypesWithQuota(Long batchId, Long classId) {
List> scholarshipTypes = new ArrayList<>();
@@ -822,8 +854,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
// 查询奖学金类型基本信息
JcbtScholarshipTypeVo typeInfo = scholarshipTypeService.queryById(scholarshipTypeId);
- log.info("奖学金类型基本信息: {}", typeInfo != null ?
- String.format("ID=%s, 名称=%s, 状态=%s, 金额=%s, 等级=%s",
+ log.info("奖学金类型基本信息: {}", typeInfo != null ? String.format("ID=%s, 名称=%s, 状态=%s, 金额=%s, 等级=%s",
typeInfo.getId(), typeInfo.getTypeName(), typeInfo.getStatus(),
typeInfo.getAwardAmount(), typeInfo.getLevelType()) : "null");
@@ -837,14 +868,18 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
scholarshipType.put("levelType", typeInfo.getLevelType());
// 查询该班级在该奖学金类型下的名额分配信息（从jcbt_scholarship_quota表查询）
- log.info("开始查询班级名额 - SQL参数: classId={}, scholarshipTypeId={}, batchId={}", classId, scholarshipTypeId, batchId);
- log.info("执行SQL: SELECT * FROM jcbt_scholarship_quota WHERE allocation_level = 'CLASS' AND target_dept_id = {} AND scholarship_type_id = {} AND batch_id = {} AND status = 'ACTIVE'", classId, scholarshipTypeId, batchId);
+ log.info("开始查询班级名额 - SQL参数: classId={}, scholarshipTypeId={}, batchId={}", classId,
+ scholarshipTypeId, batchId);
+ log.info(
+ "执行SQL: SELECT * FROM jcbt_scholarship_quota WHERE allocation_level = 'CLASS' AND target_dept_id = {} AND scholarship_type_id = {} AND batch_id = {} AND status = 'ACTIVE'",
+ classId, scholarshipTypeId, batchId);
- JcbtScholarshipQuotaVo classQuota = quotaService.selectClassQuota(classId, scholarshipTypeId, batchId);
- log.info("班级名额查询结果: {}", classQuota != null ?
- String.format("ID=%s, 总名额=%s, 已用=%s, 可用=%s, 状态=%s",
- classQuota.getId(), classQuota.getTotalQuota(), classQuota.getUsedQuota(),
- classQuota.getAvailableQuota(), classQuota.getStatus()) : "null");
+ JcbtScholarshipQuotaVo classQuota = quotaService.selectClassQuota(classId, scholarshipTypeId,
+ batchId);
+ log.info("班级名额查询结果: {}",
+ classQuota != null ? String.format("ID=%s, 总名额=%s, 已用=%s, 可用=%s, 状态=%s",
+ classQuota.getId(), classQuota.getTotalQuota(), classQuota.getUsedQuota(),
+ classQuota.getAvailableQuota(), classQuota.getStatus()) : "null");
if (classQuota != null) {
// 有班级名额分配
@@ -852,7 +887,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
scholarshipType.put("hasQuota", true);
int totalQuota = classQuota.getTotalQuota() != null ? classQuota.getTotalQuota() : 0;
int usedQuota = classQuota.getUsedQuota() != null ? classQuota.getUsedQuota() : 0;
- int availableQuota = classQuota.getAvailableQuota() != null ? classQuota.getAvailableQuota() : Math.max(0, totalQuota - usedQuota);
+ int availableQuota = classQuota.getAvailableQuota() != null ? classQuota.getAvailableQuota()
+ : Math.max(0, totalQuota - usedQuota);
scholarshipType.put("totalQuota", totalQuota);
scholarshipType.put("usedQuota", usedQuota);
@@ -860,44 +896,49 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
scholarshipType.put("quotaStatus", availableQuota > 0 ? "available" : "full");
log.info("班级名额处理结果 - 类型: {}, 总名额: {}, 已用: {}, 可用: {}, 状态: {}",
- typeInfo.getTypeName(), totalQuota, usedQuota, availableQuota, availableQuota > 0 ? "available" : "full");
+ typeInfo.getTypeName(), totalQuota, usedQuota, availableQuota,
+ availableQuota > 0 ? "available" : "full");
} else {
// 没有班级名额分配，查询全校统计信息
log.info("未找到班级名额分配，开始查询全校名额");
log.info("执行全校名额查询SQL - 参数: batchId={}, scholarshipTypeId={}", batchId, scholarshipTypeId);
- List quotaList = quotaService.queryListByBatchAndType(batchId, scholarshipTypeId);
+ List quotaList = quotaService.queryListByBatchAndType(batchId,
+ scholarshipTypeId);
log.info("全校名额查询结果数量: {}", quotaList != null ? quotaList.size() : 0);
if (quotaList != null && !quotaList.isEmpty()) {
for (int i = 0; i < quotaList.size(); i++) {
JcbtScholarshipQuotaVo quota = quotaList.get(i);
log.info("全校名额[{}]: ID={}, 分配级别={}, 目标部门={}, 总名额={}, 已用={}, 可用={}",
- i, quota.getId(), quota.getAllocationLevel(), quota.getTargetDeptName(),
- quota.getTotalQuota(), quota.getUsedQuota(), quota.getAvailableQuota());
+ i, quota.getId(), quota.getAllocationLevel(), quota.getTargetDeptName(),
+ quota.getTotalQuota(), quota.getUsedQuota(), quota.getAvailableQuota());
}
}
- int totalQuota = quotaList.stream().mapToInt(q -> q.getTotalQuota() != null ? q.getTotalQuota() : 0).sum();
- int usedQuota = quotaList.stream().mapToInt(q -> q.getUsedQuota() != null ? q.getUsedQuota() : 0).sum();
+ int totalQuota = quotaList.stream()
+ .mapToInt(q -> q.getTotalQuota() != null ? q.getTotalQuota() : 0).sum();
+ int usedQuota = quotaList.stream()
+ .mapToInt(q -> q.getUsedQuota() != null ? q.getUsedQuota() : 0).sum();
int availableQuota = Math.max(0, totalQuota - usedQuota);
scholarshipType.put("hasQuota", false);
scholarshipType.put("totalQuota", totalQuota);
scholarshipType.put("usedQuota", usedQuota);
scholarshipType.put("availableQuota", availableQuota);
- scholarshipType.put("quotaStatus", totalQuota > 0 ? (availableQuota > 0 ? "available" : "full") : "unlimited");
+ scholarshipType.put("quotaStatus",
+ totalQuota > 0 ? (availableQuota > 0 ? "available" : "full") : "unlimited");
log.info("全校名额统计结果 - 类型: {} (全校), 总名额: {}, 已用: {}, 可用: {}, 状态: {}",
- typeInfo.getTypeName(), totalQuota, usedQuota, availableQuota,
- totalQuota > 0 ? (availableQuota > 0 ? "available" : "full") : "unlimited");
+ typeInfo.getTypeName(), totalQuota, usedQuota, availableQuota,
+ totalQuota > 0 ? (availableQuota > 0 ? "available" : "full") : "unlimited");
}
scholarshipTypes.add(scholarshipType);
log.info("奖学金类型 {} 处理完成，添加到结果列表", typeInfo.getTypeName());
} else {
log.warn("奖学金类型被跳过 - ID: {}, 原因: {}", scholarshipTypeId,
- typeInfo == null ? "类型信息不存在" : "状态未启用(status=" + typeInfo.getStatus() + ")");
+ typeInfo == null ? "类型信息不存在" : "状态未启用(status=" + typeInfo.getStatus() + ")");
}
}
@@ -928,7 +969,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
for (int i = 0; i < scholarshipTypes.size(); i++) {
Map type = scholarshipTypes.get(i);
log.info("结果[{}]: 名称={}, 状态={}, 总名额={}, 可用名额={}",
- i, type.get("name"), type.get("quotaStatus"), type.get("totalQuota"), type.get("availableQuota"));
+ i, type.get("name"), type.get("quotaStatus"), type.get("totalQuota"),
+ type.get("availableQuota"));
}
} else {
log.warn("批次 {} 未关联任何奖学金类型", batchId);
@@ -948,6 +990,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 测试班级名额查询（用于SQL日志调试）
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map testClassQuotaQuery(Long classId, Long scholarshipTypeId, Long batchId) {
Map result = new HashMap<>();
@@ -960,7 +1003,8 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
// 执行查询
log.info("💾 执行班级名额查询...");
- JcbtScholarshipClassQuotaVo classQuota = classQuotaService.queryAvailableQuota(classId, scholarshipTypeId, batchId);
+ JcbtScholarshipClassQuotaVo classQuota = classQuotaService.queryAvailableQuota(classId, scholarshipTypeId,
+ batchId);
// 记录查询结束时间
long endTime = System.currentTimeMillis();
@@ -971,23 +1015,24 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
if (classQuota != null) {
log.info("✅ 查询成功，找到班级名额记录");
log.info("📊 名额详情: ID={}, 批次ID={}, 奖学金类型ID={}, 班级ID={}",
- classQuota.getId(), classQuota.getBatchId(), classQuota.getScholarshipTypeId(), classQuota.getClassId());
+ classQuota.getId(), classQuota.getBatchId(), classQuota.getScholarshipTypeId(),
+ classQuota.getClassId());
log.info("📈 名额数据: 总名额={}, 已用名额={}, 可用名额={}, 状态={}",
- classQuota.getTotalQuota(), classQuota.getUsedQuota(), classQuota.getAvailableQuota(), classQuota.getStatus());
+ classQuota.getTotalQuota(), classQuota.getUsedQuota(), classQuota.getAvailableQuota(),
+ classQuota.getStatus());
result.put("found", true);
result.put("data", Map.of(
- "id", classQuota.getId(),
- "batchId", classQuota.getBatchId(),
- "scholarshipTypeId", classQuota.getScholarshipTypeId(),
- "classId", classQuota.getClassId(),
- "totalQuota", classQuota.getTotalQuota(),
- "usedQuota", classQuota.getUsedQuota(),
- "availableQuota", classQuota.getAvailableQuota(),
- "status", classQuota.getStatus(),
- "createTime", classQuota.getCreateTime(),
- "updateTime", classQuota.getUpdateTime()
- ));
+ "id", classQuota.getId(),
+ "batchId", classQuota.getBatchId(),
+ "scholarshipTypeId", classQuota.getScholarshipTypeId(),
+ "classId", classQuota.getClassId(),
+ "totalQuota", classQuota.getTotalQuota(),
+ "usedQuota", classQuota.getUsedQuota(),
+ "availableQuota", classQuota.getAvailableQuota(),
+ "status", classQuota.getStatus(),
+ "createTime", classQuota.getCreateTime(),
+ "updateTime", classQuota.getUpdateTime()));
} else {
log.warn("⚠️ 未找到班级名额记录");
log.info("🔍 可能原因:");
@@ -1033,6 +1078,7 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
* 测试全校名额查询（用于SQL日志调试）
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public Map testSchoolQuotaQuery(Long batchId, Long scholarshipTypeId) {
Map result = new HashMap<>();
@@ -1063,9 +1109,11 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
for (int i = 0; i < quotaList.size(); i++) {
JcbtScholarshipQuotaVo quota = quotaList.get(i);
log.info("📈 记录[{}]: ID={}, 分配级别={}, 目标部门ID={}, 目标部门={}",
- i, quota.getId(), quota.getAllocationLevel(), quota.getTargetDeptId(), quota.getTargetDeptName());
+ i, quota.getId(), quota.getAllocationLevel(), quota.getTargetDeptId(),
+ quota.getTargetDeptName());
log.info("📊 名额[{}]: 总名额={}, 已用={}, 预留={}, 可用={}, 状态={}",
- i, quota.getTotalQuota(), quota.getUsedQuota(), quota.getReservedQuota(), quota.getAvailableQuota(), quota.getStatus());
+ i, quota.getTotalQuota(), quota.getUsedQuota(), quota.getReservedQuota(),
+ quota.getAvailableQuota(), quota.getStatus());
Map quotaDetail = new HashMap<>();
quotaDetail.put("id", quota.getId());
@@ -1099,11 +1147,10 @@ public class JcbtScholarshipApplicationServiceImpl implements IJcbtScholarshipAp
result.put("count", quotaList.size());
result.put("details", quotaDetails);
result.put("summary", Map.of(
- "totalQuota", totalQuota,
- "usedQuota", usedQuota,
- "availableQuota", availableQuota,
- "calculatedAvailable", Math.max(0, totalQuota - usedQuota)
- ));
+ "totalQuota", totalQuota,
+ "usedQuota", usedQuota,
+ "availableQuota", availableQuota,
+ "calculatedAvailable", Math.max(0, totalQuota - usedQuota)));
} else {
log.warn("⚠️ 未找到全校名额记录");
diff --git a/backend/ruoyi-modules/ruoyi-system/pom.xml b/backend/ruoyi-modules/ruoyi-system/pom.xml
index 0fc6d551..6723ded9 100644
--- a/backend/ruoyi-modules/ruoyi-system/pom.xml
+++ b/backend/ruoyi-modules/ruoyi-system/pom.xml
@@ -1,7 +1,6 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
org.dromara
ruoyi-modules
@@ -100,6 +99,14 @@
ruoyi-common-sse
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-webflux
+
+
diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java
index fc835a40..1631df4d 100644
--- a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java
+++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysRegionController.java
@@ -21,6 +21,9 @@ import org.dromara.system.domain.vo.SysRegionVo;
import org.dromara.system.domain.bo.SysRegionBo;
import org.dromara.system.service.ISysRegionService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.GeocodingRequestBo;
+import org.dromara.system.domain.vo.GeocodingResponseVo;
+import org.dromara.system.service.IAmapService;
/**
* 行政区划
@@ -35,6 +38,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
public class SysRegionController extends BaseController {
private final ISysRegionService sysRegionService;
+ private final IAmapService amapService;
/**
* 查询行政区划列表
@@ -110,4 +114,17 @@ public class SysRegionController extends BaseController {
List tree = sysRegionService.getRegionTree();
return R.ok(tree);
}
+
+ /**
+ * 逆地理编码
+ *
+ * @param request 请求参数
+ * @return 逆地理编码结果
+ */
+ @SaCheckPermission("system:SysRegion:geocode")
+ @PostMapping("/reverse-geocode")
+ public R reverseGeocode(@Validated @RequestBody GeocodingRequestBo request) {
+ GeocodingResponseVo result = amapService.reverseGeocode(request);
+ return R.ok(result);
+ }
}
diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/GeocodingRequestBo.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/GeocodingRequestBo.java
new file mode 100644
index 00000000..7e05ada3
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/GeocodingRequestBo.java
@@ -0,0 +1,47 @@
+package org.dromara.system.domain.bo;
+
+import lombok.Data;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.DecimalMax;
+
+/**
+ * 逆地理编码请求参数
+ *
+ * @author zlwu
+ * @date 2025-01-03
+ */
+@Data
+public class GeocodingRequestBo {
+
+ /**
+ * 经度
+ */
+ @NotNull(message = "经度不能为空")
+ @DecimalMin(value = "-180.0", message = "经度范围必须在-180到180之间")
+ @DecimalMax(value = "180.0", message = "经度范围必须在-180到180之间")
+ private Double longitude;
+
+ /**
+ * 纬度
+ */
+ @NotNull(message = "纬度不能为空")
+ @DecimalMin(value = "-90.0", message = "纬度范围必须在-90到90之间")
+ @DecimalMax(value = "90.0", message = "纬度范围必须在-90到90之间")
+ private Double latitude;
+
+ /**
+ * 返回格式，默认json
+ */
+ private String output = "json";
+
+ /**
+ * 批量查询控制，默认1
+ */
+ private Integer batch = 1;
+
+ /**
+ * 道路等级，默认0
+ */
+ private Integer roadlevel = 0;
+}
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/GeocodingResponseVo.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/GeocodingResponseVo.java
new file mode 100644
index 00000000..6238cd6f
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/GeocodingResponseVo.java
@@ -0,0 +1,268 @@
+package org.dromara.system.domain.vo;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 逆地理编码响应结果
+ *
+ * @author zlwu
+ * @date 2025-01-03
+ */
+@Data
+public class GeocodingResponseVo {
+
+ /**
+ * 状态码
+ */
+ private String status;
+
+ /**
+ * 状态信息
+ */
+ private String info;
+
+ /**
+ * 信息码
+ */
+ private String infocode;
+
+ /**
+ * 逆地理编码结果
+ */
+ private Regeocode regeocode;
+
+ /**
+ * 创建者
+ */
+ private Long createBy;
+
+ /**
+ * 创建时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 更新者
+ */
+ private Long updateBy;
+
+ /**
+ * 更新时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 逆地理编码结果详情
+ */
+ @Data
+ public static class Regeocode {
+ /**
+ * 地址信息
+ */
+ private String formattedAddress;
+
+ /**
+ * 地址组件
+ */
+ private AddressComponent addressComponent;
+
+ /**
+ * 兴趣点信息
+ */
+ private Poi[] pois;
+
+ /**
+ * 道路信息
+ */
+ private Road[] roads;
+
+ /**
+ * 道路交叉口信息
+ */
+ private RoadIntersection[] roadIntersections;
+
+ /**
+ * 兴趣区域信息
+ */
+ private Aoi[] aois;
+ }
+
+ /**
+ * 地址组件
+ */
+ @Data
+ public static class AddressComponent {
+ /**
+ * 国家
+ */
+ private String country;
+
+ /**
+ * 省份
+ */
+ private String province;
+
+ /**
+ * 城市
+ */
+ private String city;
+
+ /**
+ * 区县
+ */
+ private String district;
+
+ /**
+ * 乡镇
+ */
+ private String township;
+
+ /**
+ * 街道
+ */
+ private String street;
+
+ /**
+ * 门牌号
+ */
+ private String number;
+
+ /**
+ * 行政区划代码
+ */
+ private String adcode;
+
+ /**
+ * 城市编码
+ */
+ private String citycode;
+ }
+
+ /**
+ * 兴趣点信息
+ */
+ @Data
+ public static class Poi {
+ /**
+ * 兴趣点ID
+ */
+ private String id;
+
+ /**
+ * 兴趣点名称
+ */
+ private String name;
+
+ /**
+ * 兴趣点类型
+ */
+ private String type;
+
+ /**
+ * 兴趣点地址
+ */
+ private String address;
+
+ /**
+ * 兴趣点距离
+ */
+ private String distance;
+
+ /**
+ * 兴趣点位置
+ */
+ private String location;
+ }
+
+ /**
+ * 道路信息
+ */
+ @Data
+ public static class Road {
+ /**
+ * 道路ID
+ */
+ private String id;
+
+ /**
+ * 道路名称
+ */
+ private String name;
+
+ /**
+ * 道路距离
+ */
+ private String distance;
+
+ /**
+ * 道路方向
+ */
+ private String direction;
+
+ /**
+ * 道路位置
+ */
+ private String location;
+ }
+
+ /**
+ * 道路交叉口信息
+ */
+ @Data
+ public static class RoadIntersection {
+ /**
+ * 交叉口ID
+ */
+ private String id;
+
+ /**
+ * 交叉口名称
+ */
+ private String name;
+
+ /**
+ * 交叉口距离
+ */
+ private String distance;
+
+ /**
+ * 交叉口位置
+ */
+ private String location;
+ }
+
+ /**
+ * 兴趣区域信息
+ */
+ @Data
+ public static class Aoi {
+ /**
+ * 兴趣区域ID
+ */
+ private String id;
+
+ /**
+ * 兴趣区域名称
+ */
+ private String name;
+
+ /**
+ * 兴趣区域面积
+ */
+ private String area;
+
+ /**
+ * 兴趣区域距离
+ */
+ private String distance;
+
+ /**
+ * 兴趣区域类型
+ */
+ private String type;
+ }
+}
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAmapService.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAmapService.java
new file mode 100644
index 00000000..eabb1890
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAmapService.java
@@ -0,0 +1,21 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.bo.GeocodingRequestBo;
+import org.dromara.system.domain.vo.GeocodingResponseVo;
+
+/**
+ * 高德地图服务接口
+ *
+ * @author zlwu
+ * @date 2025-01-03
+ */
+public interface IAmapService {
+
+ /**
+ * 逆地理编码
+ *
+ * @param request 请求参数
+ * @return 逆地理编码结果
+ */
+ GeocodingResponseVo reverseGeocode(GeocodingRequestBo request);
+}
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AmapServiceImpl.java b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AmapServiceImpl.java
new file mode 100644
index 00000000..3471b6a7
--- /dev/null
+++ b/backend/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AmapServiceImpl.java
@@ -0,0 +1,80 @@
+package org.dromara.system.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.system.domain.bo.GeocodingRequestBo;
+import org.dromara.system.domain.vo.GeocodingResponseVo;
+import org.dromara.system.service.IAmapService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import cn.hutool.http.HttpUtil;
+
+/**
+ * 高德地图服务实现类
+ *
+ * @author zlwu
+ * @date 2025-01-03
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AmapServiceImpl implements IAmapService {
+
+ @Value("${amap.key:}")
+ private String amapKey;
+
+ @Value("${amap.url:https://restapi.amap.com}")
+ private String amapUrl;
+
+ @Override
+ public GeocodingResponseVo reverseGeocode(GeocodingRequestBo request) {
+ try {
+ // 构建请求URL
+ String url = buildGeocodeUrl(request);
+ log.info("高德地图逆地理编码请求URL: {}", url);
+
+ // 发送HTTP请求
+ String response = HttpUtil.get(url);
+ log.info("高德地图逆地理编码响应: {}", response);
+
+ if (StrUtil.isBlank(response)) {
+ throw new RuntimeException("高德地图API返回空响应");
+ }
+
+ // 解析JSON响应
+ GeocodingResponseVo result = JSONUtil.toBean(response, GeocodingResponseVo.class);
+
+ // 检查API响应状态
+ if (!"1".equals(result.getStatus())) {
+ log.error("高德地图API返回错误: status={}, info={}", result.getStatus(), result.getInfo());
+ throw new RuntimeException("高德地图API返回错误: " + result.getInfo());
+ }
+
+ return result;
+
+ } catch (Exception e) {
+ log.error("高德地图逆地理编码失败", e);
+ throw new RuntimeException("逆地理编码失败: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 构建逆地理编码请求URL
+ *
+ * @param request 请求参数
+ * @return 完整的请求URL
+ */
+ private String buildGeocodeUrl(GeocodingRequestBo request) {
+ StringBuilder urlBuilder = new StringBuilder(amapUrl);
+ urlBuilder.append("/v3/geocode/regeo");
+ urlBuilder.append("?key=").append(amapKey);
+ urlBuilder.append("&location=").append(request.getLongitude()).append(",").append(request.getLatitude());
+ urlBuilder.append("&output=").append(request.getOutput());
+ urlBuilder.append("&batch=").append(request.getBatch());
+ urlBuilder.append("&roadlevel=").append(request.getRoadlevel());
+
+ return urlBuilder.toString();
+ }
+}
\ No newline at end of file
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java
index 7e95800a..1cae46cb 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgClassMsgController.java
@@ -21,6 +21,7 @@ import org.dromara.xg.domain.vo.XgClassMsgVo;
import org.dromara.xg.domain.bo.XgClassMsgBo;
import org.dromara.xg.service.IXgClassMsgService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
/**
* 班级信息-新版
@@ -63,8 +64,7 @@ public class XgClassMsgController extends BaseController {
*/
@SaCheckPermission("classMsg:classMsg:query")
@GetMapping("/{id}")
- public R getInfo(@NotNull(message = "主键不能为空")
- @PathVariable Long id) {
+ public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
return R.ok(xgClassMsgService.queryById(id));
}
@@ -98,8 +98,22 @@ public class XgClassMsgController extends BaseController {
@SaCheckPermission("classMsg:classMsg:remove")
@Log(title = "班级信息-新版", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public R remove(@NotEmpty(message = "主键不能为空")
- @PathVariable Long[] ids) {
+ public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
return toAjax(xgClassMsgService.deleteWithValidByIds(List.of(ids), true));
}
+
+ /**
+ * 获取当前登录人作为班主任所管理的班级列表
+ */
+ @SaCheckPermission("classMsg:classMsg:list")
+ @GetMapping("/myClassListAsTeacher")
+ public R> myClassListAsTeacher() {
+ Long userId = LoginHelper.getUserId();
+ XgClassMsgBo bo = new XgClassMsgBo();
+ bo.setClassTeacherId(userId);
+ // 仅查询正常状态班级（1-正常）
+ bo.setClassStatus("1");
+ List list = xgClassMsgService.queryList(bo);
+ return R.ok(list);
+ }
}
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java
index 5f956dc1..f3063c1f 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedController.java
@@ -114,6 +114,19 @@ public class XgDormBedController extends BaseController {
return R.ok(list);
}
+ /**
+ * 查询当前用户所在学院的指定房间床位详细信息列表（包含学生信息）
+ *
+ * @param roomId 房间ID
+ */
+ @SaCheckPermission("dormbed:dormBed:query")
+ @GetMapping("/details/college/room/{roomId}")
+ public R> getBedDetailsByRoomIdForCurrentUserCollege(
+ @NotNull(message = "房间ID不能为空") @PathVariable Long roomId) {
+ List list = xgDormBedService.queryBedDetailsByRoomIdForCurrentUserCollege(roomId);
+ return R.ok(list);
+ }
+
/**
* 查询指定宿舍楼的床位详细信息列表（包含学生信息）
*
@@ -126,4 +139,19 @@ public class XgDormBedController extends BaseController {
List list = xgDormBedService.queryBedDetailsByBuildingId(buildingId);
return R.ok(list);
}
+
+ /**
+ * 查询指定房间中属于指定班级的床位详细信息列表（包含学生信息）
+ *
+ * @param roomId 房间ID
+ * @param classId 班级ID
+ */
+ @SaCheckPermission("dormbed:dormBed:query")
+ @GetMapping("/details/room/{roomId}/class/{classId}")
+ public R> getBedDetailsByRoomIdAndClassId(
+ @NotNull(message = "房间ID不能为空") @PathVariable Long roomId,
+ @NotNull(message = "班级ID不能为空") @PathVariable Long classId) {
+ List list = xgDormBedService.queryBedDetailsByRoomIdAndClassId(roomId, classId);
+ return R.ok(list);
+ }
}
diff --git a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java
index 78eeedf8..7de403d4 100644
--- a/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java
+++ b/backend/ruoyi-modules/ruoyi-xg/src/main/java/org/dromara/xg/controller/XgDormBedStudentController.java
@@ -20,8 +20,12 @@ import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.xg.domain.vo.XgDormBedStudentVo;
import org.dromara.xg.domain.bo.XgDormBedStudentBo;
import org.dromara.xg.domain.bo.XgDormBedBatchAllocateBo;
+import org.dromara.xg.domain.bo.XgDormBedBatchAllocateToClassBo;
import org.dromara.xg.service.IXgDormBedStudentService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.xg.domain.bo.XgDormBedBatchRecallBo;
+import org.dromara.xg.domain.vo.DormBuildingTreeVo;
+import org.dromara.xg.domain.bo.XgDormSelectiveAllocationBo;
/**
* 床位学生分配关系
@@ -115,4 +119,217 @@ public class XgDormBedStudentController extends BaseController {
return toAjax(xgDormBedStudentService.batchAllocateBedsToCollege(bo));
}
+ /**
+ * 批量分配床位给班级
+ *
+ * @param bo 批量分配给班级参数
+ */
+ @SaCheckPermission("dormBedStudent:dormBedStudent:add")
+ @Log(title = "批量分配床位给班级", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping("/batchAllocateToClass")
+ public R batchAllocateBedsToClass(
+ @Validated(AddGroup.class) @RequestBody XgDormBedBatchAllocateToClassBo bo) {
+ return toAjax(xgDormBedStudentService.batchAllocateBedsToClass(bo));
+ }
+
+ /**
+ * 批量收回宿舍床位
+ */
+ @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
+ @Log(title = "批量收回宿舍床位", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/batchRecall")
+ public R batchRecallBeds(@Validated(AddGroup.class) @RequestBody XgDormBedBatchRecallBo bo) {
+ return toAjax(xgDormBedStudentService.batchRecallBeds(bo));
+ }
+
+ /**
+ * 批量回收班级分配床位（保留学院分配）
+ */
+ @SaCheckPermission("dormBedStudent:dormBedStudent:edit")
+ @Log(title = "批量回收班级分配床位", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PostMapping("/batchRecallClassAllocation")
+ public R batchRecallClassAllocation(@Validated(AddGroup.class) @RequestBody XgDormBedBatchRecallBo bo) {
+ return toAjax(xgDormBedStudentService.batchRecallClassAllocation(bo));
+ }
+
+ /**
+ * 获取当前用户二级学院的宿舍楼树形结构
+ * 校区-宿舍区-宿舍楼三级结构，校区和宿舍区不可选，只有宿舍楼可以选择
+ */
+ @SaCheckPermission("dormBedStudent:dormBedStudent:list")
+ @GetMapping("/currentUserCollegeDormTree")
+ public R> getCurrentUserCollegeDormBuildingTree() {
+ List treeData = xgDormBedStudentService.getCurrentUserCollegeDormBuildingTree();
+ return R.ok(treeData);
+ }
+
+ /**
+ * 获取班主任管理的班级宿舍楼树形结构
+ * 只显示班主任管理班级分配到的宿舍楼
+ */
+ @SaCheckPermission("dormBedStudent:dormBedStudent:list")
+ @GetMapping("/getClassTeacherDormTree")
+ public R> getClassTeacherDormTree(@RequestParam(required = false) Long classId) {
+ List treeData = xgDormBedStudentService.getClassTeacherDormTree(classId);
+ return R.ok(treeData);
+ }
+
+ /**
+ * 获取班主任管理班级的房间床位详情（带学生信息）
+ */
+ @SaCheckPermission("dormBedStudent:dormBedStudent:list")
+ @GetMapping("/getClassTeacherBedDetails")
+ public R> getClassTeacherBedDetails(@RequestParam(required = false) Long buildingId,
+ @RequestParam(required = false) Long classId) {
+ List