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-03-21 11:28:09 +08:00
parent 5445f0d3fd
commit 3b2b82e249
14 changed files with 149 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFinanceController.java
View File

@@ -65,9 +65,9 @@ public class SysOaFinanceController extends BaseController {
}
@GetMapping("/pieData")
@GetMapping("/barData")
public R<List<SysOaFinanceVo>> pieData(SysOaFinanceBo bo) {
List<SysOaFinanceVo> sysOaFinanceList = iSysOaFinanceService.getPieData(bo);
List<SysOaFinanceVo> sysOaFinanceList = iSysOaFinanceService.getBarData(bo);
return R.ok(sysOaFinanceList);
}

3
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaProjectController.java
View File

@@ -85,6 +85,8 @@ public class SysOaProjectController extends BaseController {
return R.ok(iSysOaProjectService.getProjectDataByMonth(date));
}
/**
* 获取项目管理详细信息
*
@@ -103,7 +105,6 @@ public class SysOaProjectController extends BaseController {
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaProjectBo bo) {
System.out.println("date=====" + bo);
return toAjax(iSysOaProjectService.insertByBo(bo));
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFinanceVo.java
View File

@@ -144,5 +144,10 @@ public class SysOaFinanceVo extends SysOaFinance {
*/
private Double outMoney;
private Double totalOut;
private Double totalIn;
private String month;
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java
View File

@@ -98,6 +98,13 @@ public class SysOaProjectVo {
@ExcelProperty(value = "项目介绍")
private String introduction;
/**
* 当月支出
*/
@ExcelProperty(value = "当月支出")
private Double totalPrice;
/**
* 优先级
*/

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

@@ -70,7 +70,7 @@ public interface SysOaFinanceMapper extends BaseMapperPlus<SysOaFinanceMapper, S
* @param bo
* @return
*/
List<SysOaFinanceVo> getPieData(SysOaFinanceBo bo);
List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo);
/**

2
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFinanceService.java
View File

@@ -90,5 +90,5 @@ public interface ISysOaFinanceService {
*/
Boolean deleteSysOaFinanceById(Long financeId);
List<SysOaFinanceVo> getPieData(SysOaFinanceBo bo);
List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo);
}

4
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFinanceServiceImpl.java
View File

@@ -269,9 +269,9 @@ public class SysOaFinanceServiceImpl implements ISysOaFinanceService {
* @return
*/
@Override
public List<SysOaFinanceVo> getPieData(SysOaFinanceBo bo) {
public List<SysOaFinanceVo> getBarData(SysOaFinanceBo bo) {
return baseMapper.getPieData(bo);
return baseMapper.getBarData(bo);
}
/**

1
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java
View File

@@ -134,7 +134,6 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService {
*/
@Override
public List<SysOaProjectVo> getProjectDataByMonth(Date date) {
System.out.println(date);
if (date==null){
date = new Date();
}

1
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaWarehouseMasterServiceImpl.java
View File

@@ -129,6 +129,7 @@ public class SysOaWarehouseMasterServiceImpl implements ISysOaWarehouseMasterSer
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
System.out.println(ids);
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}