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-15 16:35:15 +08:00
parent b4b227395c
commit c0fe9c8885
10 changed files with 45 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/EmployeeFilesController.java
View File

@@ -61,7 +61,6 @@ public class EmployeeFilesController extends BaseController {
/**
* 新增文件档案管理
*/
@Log(title = "文件档案管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody UserFilesVo filesVo) {

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

@@ -129,8 +129,8 @@ public class SysOaFinanceController extends BaseController {
* 最近6个月的支出/收入情况
*/
@SaCheckPermission("oa:finance:list")
@PostMapping("/findFinanceByMonth")
public R<List<Object>> findFinanceByMonth(SysOaFinanceBo bo) {
@GetMapping("/findFinanceByMonth")
public R<List<Object>> findFinanceByMonth(SysOaFinanceBo bo,@RequestParam Map<String, Object> params) {
LocalDate now = LocalDate.now();
/* 建立一个数组 */
int[] integers = {0,1, 2, 3, 4, 5};
@@ -152,8 +152,8 @@ public class SysOaFinanceController extends BaseController {
outMap.put("financeType", '0');
outMap.put("beginTime", firstDay);
outMap.put("endTime", lastDay);
outMap.put("payType",bo.getPayType());
outMap.put("receiveAccountId",bo.getReceiveAccountId());
outMap.put("payType",params.get("payType"));
outMap.put("receiveAccountId",params.get("receiveAccountId"));
BigDecimal financeOutReduce = iSysOaFinanceService.findFinanceByTime(bo, outMap);
//收入
@@ -161,8 +161,8 @@ public class SysOaFinanceController extends BaseController {
comeMap.put("financeType", '1');
comeMap.put("beginTime", firstDay);
comeMap.put("endTime", lastDay);
comeMap.put("payType",bo.getPayType());
comeMap.put("receiveAccountId",bo.getReceiveAccountId());
comeMap.put("payType",params.get("payType"));
comeMap.put("receiveAccountId",params.get("receiveAccountId"));
BigDecimal financeComeReduce = iSysOaFinanceService.findFinanceByTime(bo, comeMap);
//收入减支出
BigDecimal subtract = financeComeReduce.subtract(financeOutReduce);

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

@@ -1,5 +1,6 @@
package com.ruoyi.oa.controller;
import java.util.Date;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
@@ -81,9 +82,9 @@ public class SysOaProjectController extends BaseController {
* 获取项目管理详细信息
*
*/
@GetMapping("/projectDataByMonth")
public R<List<SysOaProjectVo>> getProjectDataByMonth() {
return R.ok(iSysOaProjectService.getProjectDataByMonth());
@GetMapping("/projectDataByMonth/{date}")
public R<List<SysOaProjectVo>> getProjectDataByMonth(@PathVariable("date") Date date) {
return R.ok(iSysOaProjectService.getProjectDataByMonth(date));
}
/**