DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增工具中心和财务报表修改

Browse Source
This commit is contained in:
hdka
2025-06-14 19:35:05 +08:00
parent 03d2d1afcb
commit d9ae540fd7
29 changed files with 776 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/OaApplicationMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.OaApplication;
import com.ruoyi.oa.domain.vo.OaApplicationVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 应用集成Mapper接口
*
* @author ruoyi
* @date 2025-06-14
*/
public interface OaApplicationMapper extends BaseMapperPlus<OaApplicationMapper, OaApplication, OaApplicationVo> {
}

20
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFinanceMapper.java
View File

@@ -8,6 +8,8 @@ import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.oa.domain.SysOaFinance;
import com.ruoyi.oa.domain.bo.SysOaFinanceBo;
import com.ruoyi.oa.domain.dto.BarDataDTO;
import com.ruoyi.oa.domain.dto.FinanceDetailDTO;
import com.ruoyi.oa.domain.vo.SysOaFinanceVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
@@ -70,17 +72,21 @@ public interface SysOaFinanceMapper extends BaseMapperPlus<SysOaFinanceMapper, S
* @param bo
* @return
*/
List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo);
// List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo);
List<SysOaFinanceVo> selectByPaymentProgressId(Long progressId);
/**
* 项目资金管理，根据时间范围查询列表数据
* @param params
* @return
*/
// List<SysOaFinance> findFinanceByTimeAndProjectId(Map params);
List<BarDataDTO> getBarData(
@Param("projectId") Long projectId,
@Param("financeType") String financeType
);
List<FinanceDetailDTO> getFinanceDetails(
@Param("projectId") Long projectId,
@Param("financeType") String financeType
);
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaProjectMapper.java
View File

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.oa.domain.SysOaProject;
import com.ruoyi.oa.domain.bo.SysOaProjectBo;
import com.ruoyi.oa.domain.dto.ProjectActivityDTO;
import com.ruoyi.oa.domain.dto.ProjectDataDTO;
import com.ruoyi.oa.domain.vo.*;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
@@ -80,6 +82,9 @@ public interface SysOaProjectMapper extends BaseMapperPlus<SysOaProjectMapper, S
List<SysOaProjectVo> selectExpiringForeignProjects(@Param("now") Date now, @Param("expireDays") Integer expireDays, @Param("tradeType") Long tradeType);
List<ProjectDataDTO> getProjectData(@Param("month") String month);
List<ProjectActivityDTO> getProjectActivities();
BigDecimal selectPrevAvgTotalFunds(@Param("start") Date start, @Param("end") Date end, @Param("tradeType") Long tradeType);
BigDecimal selectPrevAvgContractCount(@Param("start") Date start, @Param("end") Date end, @Param("tradeType") Long tradeType);