This commit is contained in:
zlwu committed 2025-08-04 16:51:07 +08:00
commit 93e1fd0338
73 files changed
+19101 -1608

No files matched your search

@@ -3,6 +3,7 @@ package org.dromara;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
import org.springframework.scheduling.annotation.EnableAsync;
/**
* 启动程序
@@ -10,6 +11,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
* @author Lion Li
*/
@EnableAsync
@SpringBootApplication
public class DromaraApplication {
@@ -0,0 +1,61 @@
package org.dromara.config;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.task.TaskExecutor;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.ThreadPoolExecutor;
/**
* 异步任务配置
* 用于支持审批流程等异步事件处理,提升系统响应性能
*
* @author Cursor
* @date 2025-08-01
*/
@Slf4j
@Configuration
@EnableAsync
public class AsyncConfig {
/**
* 审批流程异步任务执行器
*/
@Bean("approvalTaskExecutor")
public TaskExecutor approvalTaskExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
// 核心线程数
executor.setCorePoolSize(5);
// 最大线程数
executor.setMaxPoolSize(10);
// 队列容量
executor.setQueueCapacity(50);
// 线程名前缀
executor.setThreadNamePrefix("approval-async-");
// 线程空闲存活时间(秒)
executor.setKeepAliveSeconds(60);
// 拒绝策略:调用线程执行
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
// 等待任务完成后再关闭线程池
executor.setWaitForTasksToCompleteOnShutdown(true);
// 等待时间(秒)
executor.setAwaitTerminationSeconds(30);
// 初始化
executor.initialize();
log.info("✅ 审批流程异步任务执行器初始化完成");
return executor;
}
}
@@ -72,7 +72,8 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://47.99.164.66:3306/hzdyjs_xg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# 增加锁等待超时参数,减少锁冲突
url: jdbc:mysql://47.99.164.66:3306/hzdyjs_xg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&innodb_lock_wait_timeout=120&autocommit=true
username: root
password: hn02le.34lkdLKD
# # 从库数据源
@@ -102,20 +103,22 @@ spring:
# username: SA
# password: root
hikari:
# 最大连接池数量
maxPoolSize: 20
# 最大连接池数量(增加以减少连接竞争)
maxPoolSize: 30
# 最小空闲线程数量
minIdle: 10
# 配置获取连接等待超时的时间
minIdle: 15
# 配置获取连接等待超时的时间(减少等待时间)
connectionTimeout: 30000
# 校验超时时间
validationTimeout: 5000
# 空闲连接存活最大时间,默认10分钟
idleTimeout: 600000
# 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认30分钟
maxLifetime: 1800000
# 空闲连接存活最大时间,默认10分钟(减少空闲超时)
idleTimeout: 180000
# 此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认30分钟(减少生命周期)
maxLifetime: 600000
# 多久检查一次连接的活性
keepaliveTime: 30000
# 连接测试查询(验证连接有效性)
connectionTestQuery: SELECT 1
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring.data:
@@ -129,7 +132,7 @@ spring.data:
# redis 密码必须配置
password: Hzdyjs@123456
# 连接超时时间
timeout: 10s
timeout: 30s
# 是否开启ssl
ssl.enabled: false
@@ -152,7 +155,11 @@ redisson:
# 连接空闲超时,单位:毫秒
idleConnectionTimeout: 10000
# 命令等待超时,单位:毫秒
timeout: 3000
timeout: 10000
# 命令失败重试次数
retryAttempts: 3
# 命令重试发送时间间隔,单位:毫秒
retryInterval: 1500
# 发布和订阅连接池大小
subscriptionConnectionPoolSize: 50
@@ -41,6 +41,10 @@ logging:
org.springframework: warn
org.mybatis.spring.mapper: error
org.apache.fury: warn
# 临时启用SQL日志调试
org.dromara.cw.mapper.CwApprovalRecordMapper: debug
org.dromara.cw.service.impl.CwApprovalRecordServiceImpl: debug
org.dromara.cw.listener.ApprovalProcessEventListener: debug
config: classpath:logback-plus.xml
# 用户配置
@@ -151,6 +155,9 @@ mybatis-plus:
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: org.dromara.**.domain
# 临时禁用SQL日志(减少系统负担)
# configuration:
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config:
dbConfig:
# 主键类型
@@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
* @author Lion Li
*/
@EnableTransactionManagement(proxyTargetClass = true)
@MapperScan("${mybatis-plus.mapperPackage}")
@MapperScan("org.dromara.**.mapper")
@PropertySource(value = "classpath:common-mybatis.yml", factory = YmlPropertySourceFactory.class)
public class MybatisPlusConfig {
@@ -54,7 +54,7 @@ public class MybatisPlusConfig {
* 数据权限拦截器
*/
public PlusDataPermissionInterceptor dataPermissionInterceptor() {
return new PlusDataPermissionInterceptor(SpringUtils.getProperty("mybatis-plus.mapperPackage"));
return new PlusDataPermissionInterceptor("org.dromara.**.mapper");
}
/**
@@ -1,6 +1,7 @@
package org.dromara.cw.controller;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@@ -12,12 +13,14 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.dromara.common.web.core.BaseController;
import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
import org.dromara.cw.domain.vo.CwApprovalRecordVo;
import org.dromara.cw.domain.bo.CwApprovalRecordBo;
@@ -29,6 +32,7 @@ import org.dromara.cw.service.ICwApprovalRecordService;
* @author ruoyi
* @date 2025-01-26
*/
@Slf4j
@Validated
@RequiredArgsConstructor
@RestController
@@ -80,13 +84,23 @@ public class CwApprovalRecordController extends BaseController {
/**
* 查询当前用户待审批记录列表
*/
@SaCheckPermission("cw:approval:pending")
@SaCheckPermission("cw:approval:list")
@GetMapping("/pending")
public R<List<CwApprovalRecordVo>> getPendingList() {
List<CwApprovalRecordVo> list = approvalRecordService.queryPendingByCurrentUser();
return R.ok(list);
}
/**
* 查询当前用户已审批记录列表
*/
@SaCheckPermission("cw:approval:list")
@GetMapping("/my")
public R<List<CwApprovalRecordVo>> getMyApprovedList() {
List<CwApprovalRecordVo> list = approvalRecordService.queryApprovedByCurrentUser();
return R.ok(list);
}
/**
* 查询部门待审批申报列表
*/
@@ -97,6 +111,46 @@ public class CwApprovalRecordController extends BaseController {
return R.ok(list);
}
/**
* 查询财务待审批申报列表
*/
@SaCheckPermission("cw:approval:finance")
@GetMapping("/finance/pending")
public R<List<CwApprovalRecordVo>> getFinancePendingList() {
List<CwApprovalRecordVo> list = approvalRecordService.queryFinancePendingApprovals();
return R.ok(list);
}
/**
* 查询财务已审批申报列表
*/
@SaCheckPermission("cw:approval:finance")
@GetMapping("/finance/approved")
public R<List<CwApprovalRecordVo>> getFinanceApprovedList() {
List<CwApprovalRecordVo> list = approvalRecordService.queryFinanceApprovedRecords();
return R.ok(list);
}
/**
* 查询学院领导待审批申报列表
*/
@SaCheckPermission("cw:approval:leader")
@GetMapping("/leader/pending")
public R<List<CwApprovalRecordVo>> getLeaderPendingList() {
List<CwApprovalRecordVo> list = approvalRecordService.queryLeaderPendingApprovals();
return R.ok(list);
}
/**
* 查询学院领导已审批申报列表
*/
@SaCheckPermission("cw:approval:leader")
@GetMapping("/leader/approved")
public R<List<CwApprovalRecordVo>> getLeaderApprovedList() {
List<CwApprovalRecordVo> list = approvalRecordService.queryLeaderApprovedApprovals();
return R.ok(list);
}
/**
* 查询所有待审批申报列表(超级管理员专用)
*/
@@ -147,7 +201,15 @@ public class CwApprovalRecordController extends BaseController {
@Log(title = "创建审批流程", businessType = BusinessType.INSERT)
@PostMapping("/create/{applicationId}")
public R<Void> createProcess(@PathVariable Long applicationId, @RequestParam String applicationNo) {
return toAjax(approvalRecordService.createApprovalProcess(applicationId, applicationNo));
// 收集当前用户上下文信息
Long currentUserId = LoginHelper.getUserId();
String currentUserName = LoginHelper.getUsername();
Long currentDeptId = LoginHelper.getDeptId();
String currentTenantId = LoginHelper.getTenantId();
return toAjax(approvalRecordService.createApprovalProcess(
applicationId, applicationNo,
currentUserId, currentUserName, currentDeptId, currentTenantId));
}
/**
@@ -207,4 +269,71 @@ public class CwApprovalRecordController extends BaseController {
return R.ok(hasPermission);
}
/**
* 获取可选审批人列表(院领导)
*/
@SaCheckPermission("cw:approval:finance")
@GetMapping("/approvers/{applicationId}")
public R<List<Map<String, Object>>> getAvailableApprovers(@PathVariable Long applicationId) {
List<Map<String, Object>> approvers = approvalRecordService.getAvailableApprovers(applicationId);
return R.ok(approvers);
}
/**
* 分管领导审批
*/
@SaCheckPermission("cw:approval:leader")
@PostMapping("/leader")
public R<Void> leaderApproval(@RequestParam Long applicationId,
@RequestParam String approveAction,
@RequestParam String approveOpinion) {
log.info("🔍 分管领导审批:applicationId={}, approveAction={}, approveOpinion={}",
applicationId, approveAction, approveOpinion);
try {
// 调用分管领导审批服务
approvalRecordService.leaderApproval(applicationId, approveAction, approveOpinion);
String actionText = "approve".equals(approveAction) ? "通过" : "退回";
log.info("✅ 分管领导审批成功:applicationId={}, action={}", applicationId, actionText);
return R.ok();
} catch (Exception e) {
log.error("❌ 分管领导审批失败:applicationId={}, error={}", applicationId, e.getMessage(), e);
return R.fail("审批失败:" + e.getMessage());
}
}
/**
* 财务审批
*/
@SaCheckPermission("cw:approval:finance")
@PostMapping("/finance")
public R<Void> financeApproval(@RequestParam Long applicationId,
@RequestParam String approveAction,
@RequestParam String approveOpinion,
@RequestParam(required = false) Long selectedApproverId) {
log.info("🔍 财务审批:applicationId={}, approveAction={}, approveOpinion={}, selectedApproverId={}",
applicationId, approveAction, approveOpinion, selectedApproverId);
try {
// 参数验证:审批通过时必须选择下一环节审批人
if ("approve".equals(approveAction) && selectedApproverId == null) {
log.error("❌ 财务审批参数验证失败:审批通过时必须指定下一环节审批人");
return R.fail("审批通过时必须选择下一环节的审批人");
}
// 调用财务审批服务
approvalRecordService.financeApproval(applicationId, approveAction, approveOpinion, selectedApproverId);
String actionText = "approve".equals(approveAction) ? "通过" : "退回";
log.info("✅ 财务审批成功:applicationId={}, action={}", applicationId, actionText);
return R.ok();
} catch (Exception e) {
log.error("❌ 财务审批失败:applicationId={}, error={}", applicationId, e.getMessage(), e);
return R.fail("审批失败:" + e.getMessage());
}
}
}
@@ -1,6 +1,7 @@
package org.dromara.cw.controller;
import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -81,14 +82,62 @@ public class CwProjectApplicationController extends BaseController {
}
/**
* 导出项目预算申报列表
* 导出项目申报信息
*/
@SaCheckPermission("cw:application:export")
@Log(title = "项目预算申报", businessType = BusinessType.EXPORT)
@Log(title = "项目申报", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CwProjectApplicationBo bo, HttpServletResponse response) {
List<CwProjectApplicationVo> list = projectApplicationService.exportList(bo);
ExcelUtil.exportExcel(list, "项目预算申报", CwProjectApplicationVo.class, response);
List<CwProjectApplicationVo> list = projectApplicationService.queryList(bo);
ExcelUtil.exportExcel(list, "项目申报", CwProjectApplicationVo.class, response);
}
/**
* 项目预算统计 - 获取项目清单
*/
@SaCheckPermission("cw:statistics:list")
@GetMapping("/statistics/list")
public TableDataInfo<CwProjectApplicationVo> getStatisticsList(CwProjectApplicationBo bo, PageQuery pageQuery) {
log.info("🚀 [统计页面-项目清单] Controller接收到统计查询请求");
log.info("📋 [统计页面-项目清单] 请求参数: {}", bo);
log.info("📄 [统计页面-项目清单] 分页参数: pageNum={}, pageSize={}", pageQuery.getPageNum(), pageQuery.getPageSize());
TableDataInfo<CwProjectApplicationVo> result = projectApplicationService.queryStatisticsPageList(bo, pageQuery);
log.info("✅ [统计页面-项目清单] Controller返回结果: 总数={}, 当前页记录数={}",
result.getTotal(), result.getRows() != null ? result.getRows().size() : 0);
return result;
}
/**
* 项目预算统计 - 状态统计
*/
@SaCheckPermission("cw:statistics:list")
@GetMapping("/statistics/status")
public R<Map<String, Object>> getStatusStatistics(@RequestParam(required = false) String budgetYear) {
Map<String, Object> statistics = projectApplicationService.getStatusStatistics(budgetYear);
return R.ok(statistics);
}
/**
* 项目预算统计 - 部门预算汇总
*/
@SaCheckPermission("cw:statistics:list")
@GetMapping("/statistics/department")
public R<List<Map<String, Object>>> getDepartmentStatistics(@RequestParam(required = false) String budgetYear) {
List<Map<String, Object>> statistics = projectApplicationService.getDepartmentStatistics(budgetYear);
return R.ok(statistics);
}
/**
* 项目预算统计 - 年度汇总
*/
@SaCheckPermission("cw:statistics:list")
@GetMapping("/statistics/yearly")
public R<List<Map<String, Object>>> getYearlyStatistics() {
List<Map<String, Object>> statistics = projectApplicationService.getYearlyStatistics();
return R.ok(statistics);
}
/**
@@ -131,4 +131,37 @@ public class CwApprovalRecordBo extends BaseEntity {
*/
private String configSnapshot;
// ========== 查询条件字段 ==========
/**
* 部门ID查询条件(用于部门审批页面过滤)
* 支持具体部门ID或特殊值 'current'(当前用户部门)
*/
private String deptId;
/**
* 项目名称(查询条件)
*/
private String projectName;
/**
* 申报人姓名(查询条件)
*/
private String applicantName;
/**
* 提交时间开始
*/
private String submitTimeBegin;
/**
* 提交时间结束
*/
private String submitTimeEnd;
/**
* 审批状态(查询条件)
*/
private String approvalStatus;
}
@@ -171,4 +171,65 @@ public class CwApprovalRecordVo implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
// ================ 项目申报相关字段(通过关联查询获取) ================
/**
* 项目名称
*/
@ExcelProperty(value = "项目名称")
private String projectName;
/**
* 申报人姓名
*/
@ExcelProperty(value = "申报人姓名")
private String applicantName;
/**
* 申报部门名称
*/
@ExcelProperty(value = "申报部门")
private String deptName;
/**
* 总投资(万元)
*/
@ExcelProperty(value = "总投资(万元)")
private java.math.BigDecimal totalInvestment;
/**
* 项目负责人
*/
@ExcelProperty(value = "项目负责人")
private String principal;
/**
* 部门名称(完整)
*/
private String departmentName;
/**
* 当前审批人(前端表格需要)
*/
@ExcelProperty(value = "当前审批人")
private String currentApproverName;
/**
* 审批状态(前端表格需要)
*/
@ExcelProperty(value = "审批状态")
private String approvalStatus;
/**
* 提交时间(前端表格需要)
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date submitTime;
/**
* 审批时间(前端表格需要)
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date approvalTime;
}
@@ -296,4 +296,4 @@ public class CwProjectApplicationVo implements Serializable {
* 绩效指标列表
*/
private java.util.List<CwPerformanceIndicatorVo> performanceIndicators;
}
}
@@ -14,10 +14,22 @@ public class ApprovalProcessCreatedEvent extends ApplicationEvent {
private final Long applicationId;
private final String applicationNo;
// 用户上下文信息(异步线程需要)
private final Long currentUserId;
private final String currentUserName;
private final Long currentDeptId;
private final String currentTenantId;
public ApprovalProcessCreatedEvent(Object source, Long applicationId, String applicationNo) {
public ApprovalProcessCreatedEvent(Object source, Long applicationId, String applicationNo,
Long currentUserId, String currentUserName,
Long currentDeptId, String currentTenantId) {
super(source);
this.applicationId = applicationId;
this.applicationNo = applicationNo;
this.currentUserId = currentUserId;
this.currentUserName = currentUserName;
this.currentDeptId = currentDeptId;
this.currentTenantId = currentTenantId;
}
}
@@ -3,8 +3,8 @@ package org.dromara.cw.listener;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import org.dromara.cw.event.ApprovalProcessCreatedEvent;
import org.dromara.cw.service.ICwApprovalRecordService;
@@ -22,32 +22,46 @@ public class ApprovalProcessEventListener {
private final ICwApprovalRecordService approvalRecordService;
/**
* 处理审批流程创建事件
* 处理审批流程创建事件(异步处理,不阻塞主流程)
*/
@Async("approvalTaskExecutor")
@EventListener
@Async
public void handleApprovalProcessCreated(ApprovalProcessCreatedEvent event) {
log.info("🎧 事件监听器被触发:ApprovalProcessCreatedEvent");
log.info("📋 事件详情:applicationId={}, applicationNo={}, source={}",
event.getApplicationId(), event.getApplicationNo(), event.getSource().getClass().getSimpleName());
log.info("👤 用户上下文:userId={}, userName={}, deptId={}, tenantId={}",
event.getCurrentUserId(), event.getCurrentUserName(),
event.getCurrentDeptId(), event.getCurrentTenantId());
try {
log.info("开始创建审批流程:applicationId={}, applicationNo={}",
log.info("🚀 开始处理审批流程创建事件:applicationId={}, applicationNo={}",
event.getApplicationId(), event.getApplicationNo());
Boolean result = approvalRecordService.createApprovalProcess(
event.getApplicationId(),
event.getApplicationNo()
event.getApplicationNo(),
event.getCurrentUserId(),
event.getCurrentUserName(),
event.getCurrentDeptId(),
event.getCurrentTenantId()
);
if (result) {
log.info("审批流程创建成功:applicationId={}, applicationNo={}",
log.info("✅ 事件处理成功:审批流程创建成功:applicationId={}, applicationNo={}",
event.getApplicationId(), event.getApplicationNo());
} else {
log.error("审批流程创建失败:applicationId={}, applicationNo={}",
} else {
log.error("❌ 事件处理失败:审批流程创建失败:applicationId={}, applicationNo={}",
event.getApplicationId(), event.getApplicationNo());
}
} catch (Exception e) {
log.error("处理审批流程创建事件失败:applicationId={}, applicationNo={}, error={}",
} catch (Exception e) {
log.error("💥 处理审批流程创建事件异常:applicationId={}, applicationNo={}, error={}",
event.getApplicationId(), event.getApplicationNo(), e.getMessage(), e);
// 异步处理,不会影响主业务流程
log.error("💥 异常堆栈信息:", e);
// 事件处理异常,但不影响主业务流程
}
log.info("🏁 事件监听器处理完成");
}
}
@@ -2,8 +2,11 @@ package org.dromara.cw.mapper;
import org.dromara.cw.domain.CwApprovalRecord;
import org.dromara.cw.domain.vo.CwApprovalRecordVo;
import org.dromara.cw.domain.bo.CwApprovalRecordBo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@@ -52,6 +55,30 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus<CwApprovalRecord,
@Param("nodeCode") String nodeCode,
@Param("nodeStatus") String nodeStatus);
/**
* 根据节点编码查询审批记录
*
* @param nodeCode 节点编码
* @param nodeStatus 节点状态
* @return 审批记录列表
*/
List<CwApprovalRecordVo> selectByNode(@Param("nodeCode") String nodeCode,
@Param("nodeStatus") String nodeStatus);
/**
* 查询财务审批节点的待审批记录(包含waiting和pending状态)
*
* @return 财务审批待审批记录列表
*/
List<CwApprovalRecordVo> selectFinancePendingApprovals();
/**
* 查询财务审批节点的已审批记录(completed和rejected状态)
*
* @return 财务审批已审批记录列表
*/
List<CwApprovalRecordVo> selectFinanceApprovedRecords();
/**
* 查询所有待审批记录(超级管理员专用)
*
@@ -96,4 +123,21 @@ public interface CwApprovalRecordMapper extends BaseMapperPlus<CwApprovalRecord,
*/
int batchInsert(@Param("records") List<CwApprovalRecord> records);
/**
* 分页查询审批记录(支持关联查询)
*
* @param page 分页参数
* @param bo 查询条件
* @return 分页结果
*/
IPage<CwApprovalRecordVo> selectPageWithJoin(IPage<CwApprovalRecordVo> page, @Param("bo") CwApprovalRecordBo bo);
/**
* 根据ID查询审批记录详情(包含项目申报信息)
*
* @param id 审批记录ID
* @return 审批记录详情
*/
CwApprovalRecordVo selectByIdWithJoin(@Param("id") Long id);
}
@@ -7,6 +7,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
* 审批记录Service接口
@@ -46,6 +47,28 @@ public interface ICwApprovalRecordService {
*/
List<CwApprovalRecordVo> queryPendingByCurrentUser();
/**
* 查询当前用户已审批记录列表
*/
List<CwApprovalRecordVo> queryApprovedByCurrentUser();
/**
* 分管领导审批
* @param applicationId 申请ID
* @param approveAction 审批动作 (approve/reject)
* @param approveOpinion 审批意见
*/
void leaderApproval(Long applicationId, String approveAction, String approveOpinion);
/**
* 财务审批
* @param applicationId 申请ID
* @param approveAction 审批动作 (approve/reject)
* @param approveOpinion 审批意见
* @param selectedApproverId 选择的院领导ID(审批通过时必须指定)
*/
void financeApproval(Long applicationId, String approveAction, String approveOpinion, Long selectedApproverId);
/**
* 查询指定审批人的待审批记录列表
*/
@@ -57,6 +80,29 @@ public interface ICwApprovalRecordService {
*/
List<CwApprovalRecordVo> queryDeptPendingApprovals();
/**
* 查询财务待审批申报列表
* 财务审批:部门审批通过且财务审批未通过的数据,所有部门满足条件的数据都可以看到
*/
List<CwApprovalRecordVo> queryFinancePendingApprovals();
/**
* 查询财务已审批申报列表
*/
List<CwApprovalRecordVo> queryFinanceApprovedRecords();
/**
* 查询学院领导待审批申报列表
* 学院领导审批:财务审批通过但是领导审批未通过的数据,是流程的最后一个环节
*/
List<CwApprovalRecordVo> queryLeaderPendingApprovals();
/**
* 查询学院领导已审批申报列表
* 学院领导已审批:领导审批已完成的数据
*/
List<CwApprovalRecordVo> queryLeaderApprovedApprovals();
/**
* 查询所有待审批申报列表(超级管理员专用)
* 超级管理员可以查看所有待审批的申报
@@ -91,8 +137,17 @@ public interface ICwApprovalRecordService {
/**
* 创建审批流程
* 当申报提交时,自动创建审批流程记录
*
* @param applicationId 申报ID
* @param applicationNo 申报编号
* @param currentUserId 当前用户ID
* @param currentUserName 当前用户名称
* @param currentDeptId 当前用户部门ID
* @param currentTenantId 当前租户ID
*/
Boolean createApprovalProcess(Long applicationId, String applicationNo);
Boolean createApprovalProcess(Long applicationId, String applicationNo,
Long currentUserId, String currentUserName,
Long currentDeptId, String currentTenantId);
/**
* 处理审批
@@ -130,4 +185,9 @@ public interface ICwApprovalRecordService {
*/
Boolean checkDeptApprovalPermission(Long applicationId);
/**
* 获取可选审批人列表(院领导)
*/
List<Map<String, Object>> getAvailableApprovers(Long applicationId);
}
@@ -27,6 +27,11 @@ public interface ICwProjectApplicationService {
*/
TableDataInfo<CwProjectApplicationVo> queryPageList(CwProjectApplicationBo bo, PageQuery pageQuery);
/**
* 统计页面 - 查询项目清单(不应用数据权限过滤)
*/
TableDataInfo<CwProjectApplicationVo> queryStatisticsPageList(CwProjectApplicationBo bo, PageQuery pageQuery);
/**
* 查询项目预算申报列表
*/
@@ -122,4 +127,19 @@ public interface ICwProjectApplicationService {
*/
Boolean updateApprovalStatus(Long id, String approvalStatus);
}
/**
* 获取状态统计信息
*/
Map<String, Object> getStatusStatistics(String budgetYear);
/**
* 获取部门预算汇总统计
*/
List<Map<String, Object>> getDepartmentStatistics(String budgetYear);
/**
* 获取年度汇总统计
*/
List<Map<String, Object>> getYearlyStatistics();
}
@@ -25,6 +25,8 @@ import org.springframework.context.ApplicationEventPublisher;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ThreadLocalRandom;
import java.math.BigDecimal;
import java.util.ArrayList;
/**
* 项目预算申报Service业务层处理
@@ -65,6 +67,40 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
return TableDataInfo.build(result);
}
/**
* 统计页面 - 查询项目清单(不应用数据权限过滤)
*/
@Override
public TableDataInfo<CwProjectApplicationVo> queryStatisticsPageList(CwProjectApplicationBo bo, PageQuery pageQuery) {
log.info("🚀 [统计页面-项目清单] 开始查询项目清单数据");
log.info("📋 [统计页面-项目清单] 查询参数: {}", bo);
log.info("📄 [统计页面-项目清单] 分页参数: pageNum={}, pageSize={}", pageQuery.getPageNum(), pageQuery.getPageSize());
LambdaQueryWrapper<CwProjectApplication> lqw = buildStatisticsQueryWrapper(bo);
// 打印最终的查询条件
log.info("🔍 [统计页面-项目清单] 构建的查询条件: {}", lqw.getTargetSql());
Page<CwProjectApplicationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
log.info("✅ [统计页面-项目清单] 查询完成");
log.info("📊 [统计页面-项目清单] 查询结果: 总数={}, 当前页记录数={}", result.getTotal(), result.getRecords().size());
if (!result.getRecords().isEmpty()) {
log.info("📝 [统计页面-项目清单] 前3条数据示例:");
for (int i = 0; i < Math.min(result.getRecords().size(), 3); i++) {
CwProjectApplicationVo record = result.getRecords().get(i);
log.info(" {}. ID: {}, 申报编号: {}, 项目名称: {}, 状态: {}, 申报人: {}, 部门: {}",
i + 1, record.getId(), record.getApplicationNo(), record.getProjectName(),
record.getApprovalStatus(), record.getApplicantName(), record.getDepartmentName());
}
} else {
log.warn("⚠️ [统计页面-项目清单] 查询结果为空!");
}
return TableDataInfo.build(result);
}
/**
* 查询项目预算申报列表
*/
@@ -109,10 +145,10 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
private LambdaQueryWrapper<CwProjectApplication> buildQueryWrapper(CwProjectApplicationBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CwProjectApplication> lqw = Wrappers.lambdaQuery();
// 添加数据权限过滤
addDataPermissionFilter(lqw);
lqw.like(StringUtils.isNotBlank(bo.getApplicationNo()), CwProjectApplication::getApplicationNo, bo.getApplicationNo());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), CwProjectApplication::getProjectName, bo.getProjectName());
lqw.eq(StringUtils.isNotBlank(bo.getPrincipal()), CwProjectApplication::getPrincipal, bo.getPrincipal());
@@ -136,6 +172,71 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
return lqw;
}
/**
* 构建统计查询条件(不应用数据权限过滤)
*/
private LambdaQueryWrapper<CwProjectApplication> buildStatisticsQueryWrapper(CwProjectApplicationBo bo) {
log.info("🔧 [统计页面-项目清单] 开始构建统计查询条件");
log.info("📋 [统计页面-项目清单] 输入参数: {}", bo);
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<CwProjectApplication> lqw = Wrappers.lambdaQuery();
// 统计查询不应用数据权限过滤,允许查看所有项目数据
log.info("🔍 [统计页面-项目清单] 统计查询 - 不应用数据权限过滤,显示所有项目数据");
// 记录每个查询条件的应用情况
if (StringUtils.isNotBlank(bo.getApplicationNo())) {
log.info("📝 [统计页面-项目清单] 添加申报编号模糊查询: {}", bo.getApplicationNo());
}
if (StringUtils.isNotBlank(bo.getProjectName())) {
log.info("📝 [统计页面-项目清单] 添加项目名称模糊查询: {}", bo.getProjectName());
}
if (StringUtils.isNotBlank(bo.getApprovalStatus())) {
log.info("📝 [统计页面-项目清单] 添加审批状态查询: {}", bo.getApprovalStatus());
}
if (bo.getYear() != null) {
log.info("📝 [统计页面-项目清单] 添加年度查询: {}", bo.getYear());
}
// 处理budgetYear参数(从前端传过来的)
String budgetYear = null;
if (params != null && params.containsKey("budgetYear")) {
budgetYear = (String) params.get("budgetYear");
log.info("📝 [统计页面-项目清单] 检测到budgetYear参数: {}", budgetYear);
}
lqw.like(StringUtils.isNotBlank(bo.getApplicationNo()), CwProjectApplication::getApplicationNo, bo.getApplicationNo());
lqw.like(StringUtils.isNotBlank(bo.getProjectName()), CwProjectApplication::getProjectName, bo.getProjectName());
lqw.eq(StringUtils.isNotBlank(bo.getPrincipal()), CwProjectApplication::getPrincipal, bo.getPrincipal());
lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), CwProjectApplication::getContactPhone, bo.getContactPhone());
lqw.eq(bo.getStartDate() != null, CwProjectApplication::getStartDate, bo.getStartDate());
lqw.eq(bo.getEndDate() != null, CwProjectApplication::getEndDate, bo.getEndDate());
lqw.eq(bo.getTargetSme() != null, CwProjectApplication::getTargetSme, bo.getTargetSme());
lqw.eq(bo.getTargetMicroSme() != null, CwProjectApplication::getTargetMicroSme, bo.getTargetMicroSme());
lqw.eq(bo.getImportEquipment() != null, CwProjectApplication::getImportEquipment, bo.getImportEquipment());
lqw.eq(bo.getApplicantId() != null, CwProjectApplication::getApplicantId, bo.getApplicantId());
lqw.like(StringUtils.isNotBlank(bo.getApplicantName()), CwProjectApplication::getApplicantName, bo.getApplicantName());
lqw.eq(bo.getDepartmentId() != null, CwProjectApplication::getDepartmentId, bo.getDepartmentId());
lqw.like(StringUtils.isNotBlank(bo.getDepartmentName()), CwProjectApplication::getDepartmentName, bo.getDepartmentName());
lqw.eq(StringUtils.isNotBlank(bo.getApprovalStatus()), CwProjectApplication::getApprovalStatus, bo.getApprovalStatus());
lqw.eq(bo.getYear() != null, CwProjectApplication::getYear, bo.getYear());
// 🔧 修复:处理前端传递的budgetYear参数,映射到数据库的year字段
if (StringUtils.isNotBlank(budgetYear)) {
log.info("📝 [统计页面-项目清单] 应用budgetYear查询条件: year = {}", budgetYear);
lqw.eq(CwProjectApplication::getYear, Integer.parseInt(budgetYear));
}
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
CwProjectApplication::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
lqw.between(params.get("beginSubmitTime") != null && params.get("endSubmitTime") != null,
CwProjectApplication::getSubmitTime, params.get("beginSubmitTime"), params.get("endSubmitTime"));
lqw.orderByDesc(CwProjectApplication::getCreateTime);
log.info("✅ [统计页面-项目清单] 统计查询条件构建完成");
return lqw;
}
/**
* 添加数据权限过滤
* 超级管理员:查看所有数据
@@ -243,6 +344,16 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
if (flag) {
bo.setId(add.getId());
bo.setApplicationNo(add.getApplicationNo()); // 回填申报编号,确保后续绩效指标保存时有正确的编号
// 保存绩效指标数据
if (bo.getPerformanceIndicators() != null && !bo.getPerformanceIndicators().isEmpty()) {
log.info("新增项目申报,同时保存绩效指标,数量:{}", bo.getPerformanceIndicators().size());
boolean indicatorResult = performanceIndicatorService.batchSave(add.getId(), add.getApplicationNo(), bo.getPerformanceIndicators());
if (!indicatorResult) {
log.error("保存绩效指标失败,申报ID:{}", add.getId());
throw new RuntimeException("保存绩效指标失败");
}
}
}
return flag;
}
@@ -255,7 +366,32 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
public Boolean updateByBo(CwProjectApplicationBo bo) {
CwProjectApplication update = MapstructUtils.convert(bo, CwProjectApplication.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
boolean result = baseMapper.updateById(update) > 0;
if (result) {
// 处理绩效指标数据
if (bo.getPerformanceIndicators() != null) {
log.info("修改项目申报,同时更新绩效指标,数量:{}", bo.getPerformanceIndicators().size());
// 1. 删除原有绩效指标
boolean deleteResult = performanceIndicatorService.deleteByApplicationId(bo.getId());
log.info("删除原有绩效指标结果:{}", deleteResult);
// 2. 保存新的绩效指标(如果有数据)
if (!bo.getPerformanceIndicators().isEmpty()) {
boolean saveResult = performanceIndicatorService.batchSave(bo.getId(), update.getApplicationNo(), bo.getPerformanceIndicators());
if (!saveResult) {
log.error("更新绩效指标失败,申报ID:{}", bo.getId());
throw new RuntimeException("更新绩效指标失败");
}
log.info("保存新绩效指标成功");
} else {
log.info("绩效指标为空,仅删除原有数据");
}
}
}
return result;
}
/**
@@ -292,8 +428,14 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
// 验证是否可以删除
for (Long id : ids) {
CwProjectApplication application = baseMapper.selectById(id);
if (application != null && !"1".equals(application.getApprovalStatus())) {
throw new RuntimeException("只能删除草稿状态的申报记录");
if (application != null) {
String status = application.getApprovalStatus();
// 允许删除:草稿(1/draft)、已取消(7/cancelled)、已退回(6/returned)
if (!"1".equals(status) && !"draft".equals(status) &&
!"7".equals(status) && !"cancelled".equals(status) &&
!"6".equals(status) && !"returned".equals(status)) {
throw new RuntimeException("只能删除草稿、已取消或已退回状态的申报记录");
}
}
}
}
@@ -311,7 +453,7 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
log.info("项目名称: {}", bo.getProjectName());
log.info("绩效指标数据: {}", bo.getPerformanceIndicators());
log.info("绩效指标数量: {}", bo.getPerformanceIndicators() != null ? bo.getPerformanceIndicators().size() : 0);
bo.setApprovalStatus("draft"); // 草稿状态
Boolean result;
@@ -329,10 +471,10 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
}
// 保存绩效指标
log.info("检查绩效指标保存条件: getPerformanceIndicators()={}, isEmpty()={}",
bo.getPerformanceIndicators(),
log.info("检查绩效指标保存条件: getPerformanceIndicators()={}, isEmpty()={}",
bo.getPerformanceIndicators(),
bo.getPerformanceIndicators() != null ? bo.getPerformanceIndicators().isEmpty() : "null");
if (bo.getPerformanceIndicators() != null && !bo.getPerformanceIndicators().isEmpty()) {
log.info("开始保存绩效指标,数量: {}", bo.getPerformanceIndicators().size());
try {
@@ -342,7 +484,7 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
}
} catch (Exception e) {
// 记录详细错误并重新抛出,确保事务回滚
log.error("保存绩效指标失败:applicationId={}, applicationNo={}, error={}",
log.error("保存绩效指标失败:applicationId={}, applicationNo={}, error={}",
bo.getId(), bo.getApplicationNo(), e.getMessage(), e);
throw new RuntimeException("绩效指标保存失败:" + e.getMessage(), e);
}
@@ -377,9 +519,9 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
application.getId(), application.getApplicationNo(), application.getApprovalStatus(),
application.getApplicantId(), application.getDepartmentId());
if (!"draft".equals(application.getApprovalStatus())) {
log.error("申报状态错误,当前状态:{},只能提交草稿状态的申报", application.getApprovalStatus());
throw new RuntimeException("只能提交草稿状态的申报");
if (!"draft".equals(application.getApprovalStatus()) && !"returned".equals(application.getApprovalStatus())) {
log.error("申报状态错误,当前状态:{},只能提交草稿或已退回状态的申报", application.getApprovalStatus());
throw new RuntimeException("只能提交草稿或已退回状态的申报");
}
// 检查并修复申请人信息
@@ -424,21 +566,35 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
log.error("更新申报状态失败:applicationId={}, error={}", id, e.getMessage(), e);
throw new RuntimeException("更新申报状态失败:" + e.getMessage(), e);
}
if (updateResult) {
// 发布审批流程创建事件(解决循环依赖问题)
// 异步发布审批流程创建事件(避免阻塞主流程)
try {
log.info("🚀 准备异步发布审批流程创建事件:applicationId={}, applicationNo={}", id, application.getApplicationNo());
// 在主线程中收集用户上下文信息(异步线程中无法获取)
Long currentUserId = LoginHelper.getUserId();
String currentUserName = LoginHelper.getUsername();
Long currentDeptId = LoginHelper.getDeptId();
String currentTenantId = LoginHelper.getTenantId();
log.info("📋 收集用户上下文:userId={}, userName={}, deptId={}, tenantId={}",
currentUserId, currentUserName, currentDeptId, currentTenantId);
ApprovalProcessCreatedEvent event = new ApprovalProcessCreatedEvent(
this, id, application.getApplicationNo());
this, id, application.getApplicationNo(),
currentUserId, currentUserName, currentDeptId, currentTenantId);
log.info("📤 异步发布事件(不阻塞主流程)...");
eventPublisher.publishEvent(event);
log.info("申报提交成功,已发布审批流程创建事件:applicationId={}, applicationNo={}",
log.info("✅ 审批流程创建事件发布完成(异步处理中):applicationId={}, applicationNo={}",
id, application.getApplicationNo());
} catch (Exception e) {
log.error("发布审批流程创建事件失败:applicationId={}, error={}", id, e.getMessage(), e);
// 事件发布失败不影响提交,可以后续手动创建审批流程
log.error("💥 发布审批流程创建事件失败:applicationId={}, error={}", id, e.getMessage(), e);
// 事件发布失败不影响提交,审批流程会在后台异步创建
}
} else {
log.error("申报提交失败,数据库更新返回false:applicationId={}", id);
log.error("❌ 申报提交失败,数据库更新返回false:applicationId={}", id);
}
log.info("申报提交流程完成:applicationId={}, updateResult={}", id, updateResult);
@@ -496,7 +652,7 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
}
application.setApprovalStatus(approvalStatus);
// 如果是最终通过或拒绝状态,设置审批完成时间
if ("approved".equals(approvalStatus) || "rejected".equals(approvalStatus)) {
application.setApproveTime(new Date());
@@ -559,4 +715,176 @@ public class CwProjectApplicationServiceImpl implements ICwProjectApplicationSer
return queryList(bo);
}
/**
* 获取状态统计信息
*/
@Override
public Map<String, Object> getStatusStatistics(String budgetYear) {
log.info("🔍 获取状态统计信息,预算年度:{}", budgetYear);
Map<String, Object> result = new HashMap<>();
LambdaQueryWrapper<CwProjectApplication> wrapper = Wrappers.lambdaQuery();
if (StringUtils.isNotBlank(budgetYear)) {
wrapper.eq(CwProjectApplication::getYear, Integer.parseInt(budgetYear));
}
// 总项目数
Long totalCount = baseMapper.selectCount(wrapper);
result.put("totalCount", totalCount);
// 各状态统计
List<Map<String, Object>> statusStats = new ArrayList<>();
String[] statuses = {"draft", "submitted", "approving", "approved", "rejected", "returned", "cancelled"};
String[] statusLabels = {"草稿", "已提交", "审批中", "已通过", "已拒绝", "已退回", "已取消"};
for (int i = 0; i < statuses.length; i++) {
LambdaQueryWrapper<CwProjectApplication> statusWrapper = Wrappers.lambdaQuery();
statusWrapper.eq(CwProjectApplication::getApprovalStatus, statuses[i]);
if (StringUtils.isNotBlank(budgetYear)) {
statusWrapper.eq(CwProjectApplication::getYear, Integer.parseInt(budgetYear));
}
Long count = baseMapper.selectCount(statusWrapper);
Map<String, Object> statusStat = new HashMap<>();
statusStat.put("status", statuses[i]);
statusStat.put("statusLabel", statusLabels[i]);
statusStat.put("count", count);
statusStats.add(statusStat);
}
result.put("statusStatistics", statusStats);
// 预算总金额统计
LambdaQueryWrapper<CwProjectApplication> amountWrapper = Wrappers.lambdaQuery();
if (StringUtils.isNotBlank(budgetYear)) {
amountWrapper.eq(CwProjectApplication::getYear, Integer.parseInt(budgetYear));
}
List<CwProjectApplication> applications = baseMapper.selectList(amountWrapper);
BigDecimal totalAmount = applications.stream()
.map(app -> app.getTotalInvestment() != null ? app.getTotalInvestment() : BigDecimal.ZERO)
.reduce(BigDecimal.ZERO, BigDecimal::add);
result.put("totalAmount", totalAmount);
log.info("✅ 状态统计完成:总数={}, 总金额={}", totalCount, totalAmount);
return result;
}
/**
* 获取部门预算汇总统计
*/
@Override
public List<Map<String, Object>> getDepartmentStatistics(String budgetYear) {
log.info("🔍 获取部门预算汇总统计,预算年度:{}", budgetYear);
LambdaQueryWrapper<CwProjectApplication> wrapper = Wrappers.lambdaQuery();
if (StringUtils.isNotBlank(budgetYear)) {
wrapper.eq(CwProjectApplication::getYear, Integer.parseInt(budgetYear));
}
List<CwProjectApplication> applications = baseMapper.selectList(wrapper);
// 按部门分组统计
Map<String, Map<String, Object>> deptMap = new HashMap<>();
for (CwProjectApplication app : applications) {
String deptName = app.getDepartmentName();
if (StringUtils.isBlank(deptName)) {
deptName = "未分配部门";
}
Map<String, Object> deptStat = deptMap.computeIfAbsent(deptName, k -> {
Map<String, Object> stat = new HashMap<>();
stat.put("departmentName", k);
stat.put("projectCount", 0);
stat.put("totalAmount", BigDecimal.ZERO);
stat.put("approvedCount", 0);
stat.put("approvedAmount", BigDecimal.ZERO);
return stat;
});
// 项目总数和总金额
deptStat.put("projectCount", (Integer) deptStat.get("projectCount") + 1);
BigDecimal currentTotal = (BigDecimal) deptStat.get("totalAmount");
BigDecimal appAmount = app.getTotalInvestment() != null ? app.getTotalInvestment() : BigDecimal.ZERO;
deptStat.put("totalAmount", currentTotal.add(appAmount));
// 已通过项目统计
if ("approved".equals(app.getApprovalStatus())) {
deptStat.put("approvedCount", (Integer) deptStat.get("approvedCount") + 1);
BigDecimal currentApproved = (BigDecimal) deptStat.get("approvedAmount");
deptStat.put("approvedAmount", currentApproved.add(appAmount));
}
}
List<Map<String, Object>> result = new ArrayList<>(deptMap.values());
// 按总金额降序排序
result.sort((a, b) -> {
BigDecimal amountA = (BigDecimal) a.get("totalAmount");
BigDecimal amountB = (BigDecimal) b.get("totalAmount");
return amountB.compareTo(amountA);
});
log.info("✅ 部门统计完成:{} 个部门", result.size());
return result;
}
/**
* 获取年度汇总统计
*/
@Override
public List<Map<String, Object>> getYearlyStatistics() {
log.info("🔍 获取年度汇总统计");
List<CwProjectApplication> applications = baseMapper.selectList(Wrappers.emptyWrapper());
// 按年度分组统计
Map<String, Map<String, Object>> yearMap = new HashMap<>();
for (CwProjectApplication app : applications) {
String year = app.getYear() != null ? app.getYear().toString() : "未指定年度";
Map<String, Object> yearStat = yearMap.computeIfAbsent(year, k -> {
Map<String, Object> stat = new HashMap<>();
stat.put("budgetYear", k);
stat.put("projectCount", 0);
stat.put("totalAmount", BigDecimal.ZERO);
stat.put("approvedCount", 0);
stat.put("approvedAmount", BigDecimal.ZERO);
return stat;
});
// 项目总数和总金额
yearStat.put("projectCount", (Integer) yearStat.get("projectCount") + 1);
BigDecimal currentTotal = (BigDecimal) yearStat.get("totalAmount");
BigDecimal appAmount = app.getTotalInvestment() != null ? app.getTotalInvestment() : BigDecimal.ZERO;
yearStat.put("totalAmount", currentTotal.add(appAmount));
// 已通过项目统计
if ("approved".equals(app.getApprovalStatus())) {
yearStat.put("approvedCount", (Integer) yearStat.get("approvedCount") + 1);
BigDecimal currentApproved = (BigDecimal) yearStat.get("approvedAmount");
yearStat.put("approvedAmount", currentApproved.add(appAmount));
}
}
List<Map<String, Object>> result = new ArrayList<>(yearMap.values());
// 按年度降序排序
result.sort((a, b) -> {
String yearA = (String) a.get("budgetYear");
String yearB = (String) b.get("budgetYear");
// 处理"未指定年度"的情况,让它排在最后
if ("未指定年度".equals(yearA)) return 1;
if ("未指定年度".equals(yearB)) return -1;
return yearB.compareTo(yearA);
});
log.info("✅ 年度统计完成:{} 个年度", result.size());
return result;
}
}
@@ -30,75 +30,153 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="createDept" column="create_dept" />
<result property="deleted" column="deleted" />
<result property="tenantId" column="tenant_id" />
</resultMap>
<!-- 审批记录VO专用结果映射 (包含项目申报相关字段) -->
<resultMap type="org.dromara.cw.domain.vo.CwApprovalRecordVo" id="CwApprovalRecordVoResult">
<!-- 审批记录基础字段 -->
<result property="id" column="id" />
<result property="applicationId" column="application_id" />
<result property="applicationNo" column="application_no" />
<result property="nodeCode" column="node_code" />
<result property="nodeName" column="node_name" />
<result property="nodeOrder" column="node_order" />
<result property="approverId" column="approver_id" />
<result property="approverName" column="approver_name" />
<result property="isDelegate" column="is_delegate" />
<result property="originalApproverId" column="original_approver_id" />
<result property="originalApproverName" column="original_approver_name"/>
<result property="nodeStatus" column="node_status" />
<result property="approveAction" column="approve_action" />
<result property="approveOpinion" column="approve_opinion" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="expectFinishTime" column="expect_finish_time" />
<result property="isOvertime" column="is_overtime" />
<result property="configId" column="config_id" />
<result property="configSnapshot" column="config_snapshot" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<!-- 项目申报相关字段 -->
<result property="projectName" column="project_name" />
<result property="applicantName" column="applicant_name" />
<result property="deptName" column="dept_name" />
<result property="totalInvestment" column="total_investment" />
<result property="principal" column="principal" />
<result property="departmentName" column="department_name" />
<!-- 前端表格需要的额外字段 -->
<result property="currentApproverName" column="current_approver_name" />
<result property="approvalStatus" column="approval_status" />
<result property="submitTime" column="submit_time" />
<result property="approvalTime" column="approval_time" />
</resultMap>
<sql id="selectCwApprovalRecordVo">
select id, application_id, application_no, node_code, node_name, node_order,
approver_id, approver_name, is_delegate, original_approver_id, original_approver_name,
node_status, approve_action, approve_opinion, start_time, end_time, expect_finish_time,
is_overtime, config_id, config_snapshot, create_by, create_time, update_by, update_time,
create_dept, deleted, tenant_id
from cw_approval_record
select ar.id, ar.application_id, ar.application_no, ar.node_code, ar.node_name, ar.node_order,
ar.approver_id, ar.approver_name, ar.is_delegate, ar.original_approver_id, ar.original_approver_name,
ar.node_status, ar.approve_action, ar.approve_opinion, ar.start_time, ar.end_time, ar.expect_finish_time,
ar.is_overtime, ar.config_id, ar.config_snapshot, ar.create_by, ar.create_time, ar.update_by, ar.update_time,
ar.create_dept, ar.tenant_id,
-- 项目申报相关字段
pa.project_name, pa.principal, pa.total_investment, pa.department_name,
-- 申报人姓名通过用户表关联获取
u.user_name as applicant_name,
-- 部门名称通过部门表关联获取
d.dept_name,
-- 前端表格需要的额外字段
ar.approver_name as current_approver_name,
ar.node_status as approval_status,
pa.create_time as submit_time,
ar.end_time as approval_time
from cw_approval_record ar
left join cw_project_application pa on ar.application_id = pa.id
left join sys_user u on pa.create_by = u.user_id
left join sys_dept d on pa.department_id = d.dept_id
</sql>
<select id="selectByApplicationId" parameterType="Long" resultType="org.dromara.cw.domain.vo.CwApprovalRecordVo">
<select id="selectByApplicationId" parameterType="Long" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where application_id = #{applicationId} and deleted = 0
order by node_order asc, create_time asc
where ar.application_id = #{applicationId}
order by ar.node_order asc, ar.create_time asc
</select>
<select id="selectByApplicationNo" parameterType="String" resultType="org.dromara.cw.domain.vo.CwApprovalRecordVo">
<select id="selectByApplicationNo" parameterType="String" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where application_no = #{applicationNo} and deleted = 0
order by node_order asc, create_time asc
where ar.application_no = #{applicationNo}
order by ar.node_order asc, ar.create_time asc
</select>
<select id="selectPendingByApproverId" resultType="org.dromara.cw.domain.vo.CwApprovalRecordVo">
<select id="selectPendingByApproverId" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where approver_id = #{approverId}
and node_status = #{nodeStatus}
and deleted = 0
order by start_time desc
where ar.approver_id = #{approverId}
and ar.node_status = #{nodeStatus}
order by ar.start_time desc
</select>
<select id="selectByApproverAndNode" resultType="org.dromara.cw.domain.vo.CwApprovalRecordVo">
<select id="selectByApproverAndNode" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where approver_id = #{approverId}
and node_code = #{nodeCode}
and node_status = #{nodeStatus}
and deleted = 0
order by create_time desc
where ar.approver_id = #{approverId}
and ar.node_code = #{nodeCode}
and ar.node_status = #{nodeStatus}
order by ar.create_time desc
</select>
<select id="selectAllPendingApprovals" resultType="org.dromara.cw.domain.vo.CwApprovalRecordVo">
<select id="selectByNode" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where node_status = #{nodeStatus}
and deleted = 0
order by create_time desc
where ar.node_code = #{nodeCode}
and ar.node_status = #{nodeStatus}
order by ar.create_time desc
</select>
<select id="selectByApplicationAndNode" resultType="org.dromara.cw.domain.vo.CwApprovalRecordVo">
<!-- 查询财务审批节点的待审批记录(只查询waiting状态) -->
<select id="selectFinancePendingApprovals" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where application_id = #{applicationId}
and node_code = #{nodeCode}
and deleted = 0
order by create_time desc
where ar.node_code = 'finance_approve'
and ar.node_status = 'waiting'
order by ar.create_time desc
</select>
<!-- 查询财务审批节点的已审批记录(approved和rejected状态) -->
<select id="selectFinanceApprovedRecords" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where ar.node_code = 'finance_approve'
and ar.node_status in ('approved', 'rejected')
order by ar.end_time desc
</select>
<select id="selectAllPendingApprovals" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where ar.node_status = #{nodeStatus}
order by ar.create_time desc
</select>
<select id="selectByApplicationAndNode" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where ar.application_id = #{applicationId}
and ar.node_code = #{nodeCode}
order by ar.create_time desc
limit 1
</select>
<select id="selectCurrentApprovalNode" resultType="org.dromara.cw.domain.vo.CwApprovalRecordVo">
<select id="selectCurrentApprovalNode" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where application_id = #{applicationId}
and node_status = #{nodeStatus}
and deleted = 0
order by node_order asc
where ar.application_id = #{applicationId}
and ar.node_status = #{nodeStatus}
order by ar.node_order asc
limit 1
</select>
<!-- 根据ID查询审批记录详情(包含项目申报信息) -->
<select id="selectByIdWithJoin" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
where ar.id = #{id}
</select>
<delete id="deleteByApplicationId" parameterType="Long">
update cw_approval_record set deleted = 1
delete from cw_approval_record
where application_id = #{applicationId}
</delete>
@@ -108,7 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
approver_id, approver_name, is_delegate, original_approver_id, original_approver_name,
node_status, approve_action, approve_opinion, start_time, end_time, expect_finish_time,
is_overtime, config_id, config_snapshot, create_by, create_time, update_by, update_time,
create_dept, deleted, tenant_id
create_dept, tenant_id
) values
<foreach collection="records" item="record" separator=",">
(
@@ -118,9 +196,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{record.nodeStatus}, #{record.approveAction}, #{record.approveOpinion},
#{record.startTime}, #{record.endTime}, #{record.expectFinishTime}, #{record.isOvertime},
#{record.configId}, #{record.configSnapshot}, #{record.createBy}, #{record.createTime},
#{record.updateBy}, #{record.updateTime}, #{record.createDept}, #{record.deleted}, #{record.tenantId}
#{record.updateBy}, #{record.updateTime}, #{record.createDept}, #{record.tenantId}
)
</foreach>
</insert>
<!-- 分页查询审批记录(支持关联查询和复杂条件) -->
<select id="selectPageWithJoin" resultMap="CwApprovalRecordVoResult">
<include refid="selectCwApprovalRecordVo"/>
<where>
<if test="bo.applicationId != null">
AND ar.application_id = #{bo.applicationId}
</if>
<if test="bo.applicationNo != null and bo.applicationNo != ''">
AND ar.application_no = #{bo.applicationNo}
</if>
<if test="bo.nodeCode != null and bo.nodeCode != ''">
AND ar.node_code = #{bo.nodeCode}
</if>
<if test="bo.nodeStatus != null and bo.nodeStatus != ''">
AND ar.node_status = #{bo.nodeStatus}
</if>
<if test="bo.approverId != null">
AND ar.approver_id = #{bo.approverId}
</if>
<if test="bo.approverName != null and bo.approverName != ''">
AND ar.approver_name like concat('%', #{bo.approverName}, '%')
</if>
<if test="bo.submitTimeBegin != null and bo.submitTimeBegin != ''">
AND ar.create_time >= #{bo.submitTimeBegin}
</if>
<if test="bo.submitTimeEnd != null and bo.submitTimeEnd != ''">
AND ar.create_time &lt;= #{bo.submitTimeEnd}
</if>
<!-- 注意:部门审批查询的特殊条件已经在Service层处理并设置到BO中 -->
</where>
ORDER BY ar.create_time DESC
</select>
</mapper>