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-12 17:43:56 +08:00
parent cc6bba96f6
commit e8adc2b14d
13 changed files with 317 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaAttendanceRecordController.java
View File

@@ -2,23 +2,21 @@ package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import com.ruoyi.oa.domain.vo.ProjectAttendanceVo;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.OaAttendanceRecordVo;
import com.ruoyi.oa.domain.bo.OaAttendanceRecordBo;
@@ -99,4 +97,18 @@ public class OaAttendanceRecordController extends BaseController {
@PathVariable Long[] recordIds) {
return toAjax(iOaAttendanceRecordService.deleteWithValidByIds(Arrays.asList(recordIds), true));
}
@GetMapping("/attendance")
public R<List<ProjectAttendanceVo>>getAttendance(
@RequestParam List<String> userIds,
@RequestParam(required = false) String calcTime,
@RequestParam String relationMonth) {
// 使用 Stream 将 List<String> 转换为 List<Long>
List<Long> longList = userIds.stream()
.map(Long::parseLong) // 将每个 String 转换为 Long
.collect(Collectors.toList());
return R.ok(iOaAttendanceRecordService.getAttendance(longList,calcTime, relationMonth));
}
}

9
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseMasterController.java
View File

@@ -128,4 +128,13 @@ public class SysOaWarehouseMasterController extends BaseController {
@PathVariable Long[] masterIds) {
return toAjax(iSysOaWarehouseMasterService.deleteWithValidByIds(Arrays.asList(masterIds), true));
}
/**
* 撤回出库单
* 这个傻逼库房非得让写个撤回 勾八自己写错了信息化背锅
*/
@GetMapping("/redo/{masterId}")
public R<Void> redo(@PathVariable("masterId") Long masterId) {
return toAjax(iSysOaWarehouseMasterService.redoMaster(masterId));
}
}