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

330任务完成

Browse Source
This commit is contained in:
hdka
2025-03-30 19:43:55 +08:00
parent 17a63b5e2a
commit dbc2515bf0
70 changed files with 3272 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/OaFeedbackController.java Normal file
View File

@@ -0,0 +1,118 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
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.OaFeedbackVo;
import com.ruoyi.oa.domain.bo.OaFeedbackBo;
import com.ruoyi.oa.service.IOaFeedbackService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 问题反馈
*
* @author ruoyi
* @date 2025-03-28
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/feedback")
public class OaFeedbackController extends BaseController {
private final IOaFeedbackService iOaFeedbackService;
/**
* 查询问题反馈列表
*/
@GetMapping("/list")
public TableDataInfo<OaFeedbackVo> list(OaFeedbackBo bo, PageQuery pageQuery) {
return iOaFeedbackService.queryPageList(bo, pageQuery);
}
/**
* 导出问题反馈列表
*/
@PostMapping("/export")
public void export(OaFeedbackBo bo, HttpServletResponse response) {
List<OaFeedbackVo> list = iOaFeedbackService.queryList(bo);
ExcelUtil.exportExcel(list, "问题反馈", OaFeedbackVo.class, response);
}
/**
* 获取问题反馈详细信息
*
* @param feedbackId 主键
*/
@GetMapping("/{feedbackId}")
public R<OaFeedbackVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long feedbackId) {
return R.ok(iOaFeedbackService.queryById(feedbackId));
}
/**
* 新增问题反馈
*/
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody OaFeedbackBo bo) {
return toAjax(iOaFeedbackService.insertByBo(bo));
}
/**
* 修改问题反馈
*/
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody OaFeedbackBo bo) {
return toAjax(iOaFeedbackService.updateByBo(bo));
}
/**
* 删除问题反馈
*
* @param feedbackIds 主键串
*/
@DeleteMapping("/{feedbackIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] feedbackIds) {
return toAjax(iOaFeedbackService.deleteWithValidByIds(Arrays.asList(feedbackIds), true));
}
/**
* 删除问题反馈
*
* @param feedbackId 主键
*/
@DeleteMapping("/remove/{feedbackId}")
public R<Void> removeItem(@PathVariable("feedbackId") Long feedbackId) {
return toAjax(iOaFeedbackService.delItem(feedbackId));
}
/**
* 修改问题反馈
*/
@RepeatSubmit()
@PutMapping("/toRead")
public R<Void> toRead(@Validated(EditGroup.class) @RequestBody OaFeedbackBo bo) {
return toAjax(iOaFeedbackService.updateToRead(bo));
}
}

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

@@ -45,10 +45,9 @@ public class SysOaRemindController extends BaseController {
* @param bo
* @return
*/
@SaCheckPermission("oa:remind:list")
@GetMapping("/getRemindList")
public R<List<SysOaRemindVo>> getRemindList(SysOaRemindBo bo){
R<List<SysOaRemindVo>> remindList = iSysOaRemindService.queryRemindList(bo);
public R<List<SysOaRemindVo>> getRemindList(SysOaRemindBo bo, PageQuery pageQuery){
R<List<SysOaRemindVo>> remindList = iSysOaRemindService.queryRemindList(bo,pageQuery);
return remindList;
}
@@ -57,7 +56,6 @@ public class SysOaRemindController extends BaseController {
* @param bo
* @return
*/
@SaCheckPermission("oa:remind:list")
@GetMapping("/getRemindCount")
public R getRemindCount(SysOaRemindBo bo){
Long aLong = iSysOaRemindService.queryRemindCount(bo);
@@ -67,7 +65,6 @@ public class SysOaRemindController extends BaseController {
/**
* 查询事件提醒列表
*/
@SaCheckPermission("oa:remind:list")
@GetMapping("/list")
public TableDataInfo<SysOaRemindVo> list(SysOaRemindBo bo, PageQuery pageQuery) {
return iSysOaRemindService.queryPageList(bo, pageQuery);
@@ -76,7 +73,6 @@ public class SysOaRemindController extends BaseController {
/**
* 导出事件提醒列表
*/
@SaCheckPermission("oa:remind:export")
@Log(title = "事件提醒", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaRemindBo bo, HttpServletResponse response) {
@@ -89,7 +85,6 @@ public class SysOaRemindController extends BaseController {
*
* @param remindId 主键
*/
@SaCheckPermission("oa:remind:query")
@GetMapping("/{remindId}")
public R<SysOaRemindVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long remindId) {
@@ -99,7 +94,6 @@ public class SysOaRemindController extends BaseController {
/**
* 新增事件提醒
*/
@SaCheckPermission("oa:remind:add")
@Log(title = "事件提醒", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -110,7 +104,6 @@ public class SysOaRemindController extends BaseController {
/**
* 修改事件提醒
*/
@SaCheckPermission("oa:remind:edit")
@Log(title = "事件提醒", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -123,7 +116,6 @@ public class SysOaRemindController extends BaseController {
*
* @param remindIds 主键串
*/
@SaCheckPermission("oa:remind:remove")
@Log(title = "事件提醒", businessType = BusinessType.DELETE)
@DeleteMapping("/{remindIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

37
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskController.java
View File

@@ -1,14 +1,13 @@
package com.ruoyi.oa.controller;
import java.util.*;
import java.util.concurrent.TimeUnit;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.oa.domain.SysOaTask;
import com.ruoyi.oa.domain.UserMonthlyData;
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;
@@ -18,7 +17,6 @@ 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.SysOaTaskVo;
@@ -65,6 +63,24 @@ public class SysOaTaskController extends BaseController {
return iSysOaTaskService.queryPageListOwn(bo, pageQuery);
}
/**
* 查询任务管理列表
*/
@GetMapping("/list-own-document")
public TableDataInfo<SysOaTaskVo> listOwnDocument(SysOaTaskBo bo, PageQuery pageQuery) {
return iSysOaTaskService.queryPageListDocument(bo, pageQuery);
}
/**
* 查询此项目挂接的所有文件
*/
@GetMapping("/list-document-project/{projectId}")
public R<List<SysOaTaskVo>> listDocumentProject(@PathVariable Long projectId) {
return R.ok(iSysOaTaskService.listDocumentProject(projectId));
}
/**
* 根据工作类型字典查询任务列表
* @param pid
@@ -159,4 +175,17 @@ public class SysOaTaskController extends BaseController {
@PathVariable Long[] taskIds) {
return toAjax(iSysOaTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true));
}
/**
* 示例：获取指定月份的员工任务统计
*
* @return 符合条件的List<UserMonthlyData>
*/
@GetMapping("/monthData/list/{date}")
public TableDataInfo<UserMonthlyData> getMonthlyData(@PathVariable("date") String month) {
// 假设这是一份模拟数据，你可以从数据库/服务中获取
return iSysOaTaskService.getMonthlyData(month);
}
}

117
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskItemController.java Normal file
View File

@@ -0,0 +1,117 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
import com.ruoyi.oa.service.ISysOaTaskService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.extern.slf4j.Slf4j;
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.SysOaTaskItemVo;
import com.ruoyi.oa.domain.bo.SysOaTaskItemBo;
import com.ruoyi.oa.service.ISysOaTaskItemService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 报工任务单元
*
* @author hdka
* @date 2025-03-27
*/
@Slf4j
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/oaTaskItem")
public class SysOaTaskItemController extends BaseController {
private final ISysOaTaskItemService iSysOaTaskItemService;
private final ISysOaTaskService iSysOaTaskService;
/**
* 查询报工任务单元列表
*/
@GetMapping("/list")
public TableDataInfo<SysOaTaskItemVo> list(SysOaTaskItemBo bo, PageQuery pageQuery) {
return iSysOaTaskItemService.queryPageList(bo, pageQuery);
}
/**
* 导出报工任务单元列表
*/
@Log(title = "报工任务单元", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaTaskItemBo bo, HttpServletResponse response) {
List<SysOaTaskItemVo> list = iSysOaTaskItemService.queryList(bo);
ExcelUtil.exportExcel(list, "报工任务单元", SysOaTaskItemVo.class, response);
}
/**
* 获取报工任务单元详细信息
*
* @param itemId 主键
*/
@GetMapping("/{itemId}")
public R<SysOaTaskItemVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long itemId) {
System.out.println(itemId);
return R.ok(iSysOaTaskItemService.queryById(itemId));
}
/**
* 新增报工任务单元
*/
@Log(title = "报工任务单元", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaTaskItemBo bo) {
return toAjax(iSysOaTaskItemService.insertByBo(bo));
}
/**
* 修改报工任务单元
*/
@Log(title = "报工任务单元", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaTaskItemBo bo) {
return toAjax(iSysOaTaskItemService.updateByBo(bo));
}
/**
* 修改报工任务单元
*/
@Log(title = "报工任务单元", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping("/reportSubmit")
public R<Void> reportSubmit(@Validated(EditGroup.class) @RequestBody SysOaTaskItemBo bo) {
return toAjax(iSysOaTaskItemService.reportSubmit(bo));
}
/**
* 删除报工任务单元
*
* @param itemIds 主键串
*/
@DeleteMapping("/{itemIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] itemIds) {
return toAjax(iSysOaTaskItemService.deleteWithValidByIds(Arrays.asList(itemIds), true));
}
}

104
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaTaskUserController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
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.SysOaTaskUserVo;
import com.ruoyi.oa.domain.bo.SysOaTaskUserBo;
import com.ruoyi.oa.service.ISysOaTaskUserService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 文件共享表
*
* @author hdka
* @date 2025-03-28
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/oaTaskUser")
public class SysOaTaskUserController extends BaseController {
private final ISysOaTaskUserService iSysOaTaskUserService;
/**
* 查询文件共享表列表
*/
@SaCheckPermission("oa:oaTaskUser:list")
@GetMapping("/list")
public TableDataInfo<SysOaTaskUserVo> list(SysOaTaskUserBo bo, PageQuery pageQuery) {
return iSysOaTaskUserService.queryPageList(bo, pageQuery);
}
/**
* 导出文件共享表列表
*/
@SaCheckPermission("oa:oaTaskUser:export")
@Log(title = "文件共享表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaTaskUserBo bo, HttpServletResponse response) {
List<SysOaTaskUserVo> list = iSysOaTaskUserService.queryList(bo);
ExcelUtil.exportExcel(list, "文件共享表", SysOaTaskUserVo.class, response);
}
/**
* 获取文件共享表详细信息
*
* @param taskUserId 主键
*/
@GetMapping("/{taskUserId}")
public R<SysOaTaskUserVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long taskUserId) {
return R.ok(iSysOaTaskUserService.queryById(taskUserId));
}
/**
* 新增文件共享表
*/
@Log(title = "文件共享表", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaTaskUserBo bo) {
return toAjax(iSysOaTaskUserService.insertByBo(bo));
}
/**
* 修改文件共享表
*/
@Log(title = "文件共享表", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaTaskUserBo bo) {
return toAjax(iSysOaTaskUserService.updateByBo(bo));
}
/**
* 删除文件共享表
*
* @param taskUserIds 主键串
*/
@Log(title = "文件共享表", businessType = BusinessType.DELETE)
@DeleteMapping("/{taskUserIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] taskUserIds) {
return toAjax(iSysOaTaskUserService.deleteWithValidByIds(Arrays.asList(taskUserIds), true));
}
}

38
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseController.java
View File

@@ -3,6 +3,7 @@ package com.ruoyi.oa.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.ruoyi.common.excel.ExcelResult;
@@ -53,17 +54,32 @@ public class SysOaWarehouseController extends BaseController {
/**
* 查询仓库管理列表
*/
@SaCheckPermission("oa:oaWarehouse:list")
@GetMapping("/list")
public TableDataInfo<SysOaWarehouseVo> list(SysOaWarehouseBo bo, PageQuery pageQuery) {
return iSysOaWarehouseService.queryPageList(bo, pageQuery);
}
/**
* 查询仓库管理列表
*/
@GetMapping("/listThreshold")
public TableDataInfo<SysOaWarehouseVo> listThreshold(SysOaWarehouseBo bo, PageQuery pageQuery) {
return iSysOaWarehouseService.queryPageListThreshold(bo, pageQuery,true);
}
/**
* 查询仓库管理列表
*/
@GetMapping("/listNotThreshold")
public TableDataInfo<SysOaWarehouseVo> listNotThreshold(SysOaWarehouseBo bo, PageQuery pageQuery) {
return iSysOaWarehouseService.queryPageListThreshold(bo, pageQuery,false);
}
/**
* 通过一个name查询多个字段
*/
@SaCheckPermission("oa:oaWarehouse:list")
@GetMapping("/listByMultiQuery")
public TableDataInfo<SysOaWarehouseVo> listByMultiQuery(SysOaWarehouseBo bo, PageQuery pageQuery) {
return iSysOaWarehouseService.listByMultiQuery(bo, pageQuery);
@@ -73,7 +89,6 @@ public class SysOaWarehouseController extends BaseController {
/**
* 导出仓库管理列表
*/
@SaCheckPermission("oa:oaWarehouse:export")
@Log(title = "仓库管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaWarehouseBo bo, HttpServletResponse response) {
@@ -86,7 +101,6 @@ public class SysOaWarehouseController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("oa:oaWarehouse:query")
@GetMapping("/{id}")
public R<SysOaWarehouseVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@@ -96,7 +110,6 @@ public class SysOaWarehouseController extends BaseController {
/**
* 新增仓库管理
*/
@SaCheckPermission("oa:oaWarehouse:add")
@Log(title = "仓库管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -109,7 +122,6 @@ public class SysOaWarehouseController extends BaseController {
/**
* 修改仓库管理
*/
@SaCheckPermission("oa:oaWarehouse:edit")
@Log(title = "仓库管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -123,7 +135,6 @@ public class SysOaWarehouseController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("oa:oaWarehouse:remove")
@Log(title = "仓库管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@@ -132,6 +143,17 @@ public class SysOaWarehouseController extends BaseController {
}
/**
* 新增仓库管理
*/
@Log(title = "仓库管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/insert")
public R<Void> add(@Validated(AddGroup.class) @RequestBody List<SysOaWarehouseBo> boList) {
return toAjax(iSysOaWarehouseService.insertBatch(boList));
}
/**
* 导入数据
*
@@ -139,7 +161,6 @@ public class SysOaWarehouseController extends BaseController {
* @param updateSupport 是否更新已存在数据
*/
@Log(title = "入库工单导入", businessType = BusinessType.IMPORT)
@SaCheckPermission("complaint:complaint:import")
@PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
ExcelResult<SysOaWarehouseVo> result = ExcelUtil.importExcel(file.getInputStream(), SysOaWarehouseVo.class,
@@ -155,6 +176,7 @@ public class SysOaWarehouseController extends BaseController {
list.add(bo);
});
sysOaWarehouseMaster.setWarehouseList(list);
sysOaWarehouseMaster.setMasterNum(UUID.randomUUID().toString());
iSysOaWarehouseMasterService.insertByBo(sysOaWarehouseMaster);
return R.ok(result.getAnalysis());
}

8
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseDetailController.java
View File

@@ -44,7 +44,6 @@ public class SysOaWarehouseDetailController extends BaseController {
/**
* 查询仓库出库列表
*/
@SaCheckPermission("oa:oaOutWarehouse:list")
@GetMapping("/list")
public TableDataInfo<SysOaOutWarehouseListVo> list(SysOaWarehouseDetailBo bo, PageQuery pageQuery) {
return iSysOaWarehouseDetailService.queryPageList(bo, pageQuery);
@@ -53,7 +52,6 @@ public class SysOaWarehouseDetailController extends BaseController {
/**
* 导出仓库出库列表
*/
@SaCheckPermission("oa:oaOutWarehouse:export")
@Log(title = "仓库出库", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaWarehouseDetailBo bo, HttpServletResponse response) {
@@ -66,7 +64,6 @@ public class SysOaWarehouseDetailController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("oa:oaOutWarehouse:query")
@GetMapping("/{id}")
public R<SysOaWarehouseDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@@ -78,7 +75,6 @@ public class SysOaWarehouseDetailController extends BaseController {
*
* @param WarehouseId 出库产品id
*/
@SaCheckPermission("oa:oaOutWarehouse:query")
@GetMapping("/WarehouseIdList/{WarehouseId}")
public TableDataInfo<SysOaWarehouseDetailVo> ListByWarehouseId(@NotNull(message = "出库产品ID不能为空")
@PathVariable Long WarehouseId) {
@@ -90,7 +86,6 @@ public class SysOaWarehouseDetailController extends BaseController {
*
* @param projectId 出库产品id
*/
@SaCheckPermission("oa:oaOutWarehouse:query")
@GetMapping("/project/{projectId}")
public TableDataInfo<SysOaWarehouseDetailVo> queryOutWarehouseByProjectId(@NotNull(message = "项目名不能为空")
@PathVariable Long projectId) {
@@ -102,7 +97,6 @@ public class SysOaWarehouseDetailController extends BaseController {
/**
* 新增仓库出库
*/
@SaCheckPermission("oa:oaOutWarehouse:add")
@Log(title = "仓库出库", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@@ -113,7 +107,6 @@ public class SysOaWarehouseDetailController extends BaseController {
/**
* 修改仓库出库
*/
@SaCheckPermission("oa:oaOutWarehouse:edit")
@Log(title = "仓库出库", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@@ -126,7 +119,6 @@ public class SysOaWarehouseDetailController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("oa:oaOutWarehouse:remove")
@Log(title = "仓库出库", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -8,6 +8,8 @@ import java.util.concurrent.TimeUnit;
import com.ruoyi.oa.domain.bo.SysOaWarehouseBo;
import com.ruoyi.oa.domain.vo.SysOaWarehouseVo;
import com.ruoyi.oa.service.ISysOaWarehouseDetailService;
import com.ruoyi.oa.service.ISysOaWarehouseService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -43,6 +45,8 @@ public class SysOaWarehouseMasterController extends BaseController {
private final ISysOaWarehouseMasterService iSysOaWarehouseMasterService;
private final ISysOaWarehouseService warehouseService;
/**
* 查询出库单管理列表
*/
@@ -51,6 +55,15 @@ public class SysOaWarehouseMasterController extends BaseController {
return iSysOaWarehouseMasterService.queryPageList(bo, pageQuery);
}
/**
* 查询出库单管理列表
*/
@GetMapping("/list-task")
public TableDataInfo<SysOaWarehouseMasterVo> listTask(SysOaWarehouseMasterBo bo, PageQuery pageQuery) {
bo.setType(2L);
return iSysOaWarehouseMasterService.queryPageList(bo, pageQuery);
}
/**
* 导出出库单管理列表
*/
@@ -89,6 +102,7 @@ public class SysOaWarehouseMasterController extends BaseController {
@RepeatSubmit()
@PostMapping("/in")
public R<Void> addIn(@Validated(AddGroup.class) @RequestBody SysOaWarehouseBo bo) {
warehouseService.insertByBo(bo);
return toAjax(iSysOaWarehouseMasterService.insertInWarehouse(bo));
}

124
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaWarehouseTaskController.java Normal file
View File

@@ -0,0 +1,124 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
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.SysOaWarehouseTaskVo;
import com.ruoyi.oa.domain.bo.SysOaWarehouseTaskBo;
import com.ruoyi.oa.service.ISysOaWarehouseTaskService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 采购计划
*
* @author hdka
* @date 2025-03-30
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/oa/oaWarehouseTask")
public class SysOaWarehouseTaskController extends BaseController {
private final ISysOaWarehouseTaskService iSysOaWarehouseTaskService;
/**
* 查询采购计划列表
*/
@GetMapping("/list")
public TableDataInfo<SysOaWarehouseTaskVo> list(SysOaWarehouseTaskBo bo, PageQuery pageQuery) {
return iSysOaWarehouseTaskService.queryPageList(bo, pageQuery);
}
/**
* 导出采购计划列表
*/
@PostMapping("/export")
public void export(SysOaWarehouseTaskBo bo, HttpServletResponse response) {
List<SysOaWarehouseTaskVo> list = iSysOaWarehouseTaskService.queryList(bo);
ExcelUtil.exportExcel(list, "采购计划", SysOaWarehouseTaskVo.class, response);
}
/**
* 获取采购计划详细信息
*
* @param taskId 主键
*/
@GetMapping("/{taskId}")
public R<SysOaWarehouseTaskVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long taskId) {
return R.ok(iSysOaWarehouseTaskService.queryById(taskId));
}
/**
* 获取采购计划详细信息
*
* @param masterId 主键
*/
@GetMapping("/masterId/{masterId}")
public R<List<SysOaWarehouseTaskVo>> getInfoByMasterId(@NotNull(message = "主键不能为空")
@PathVariable Long masterId) {
return R.ok(iSysOaWarehouseTaskService.queryByMasterId(masterId));
}
/**
* 新增采购计划
*/
@Log(title = "采购计划", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaWarehouseTaskBo bo) {
return toAjax(iSysOaWarehouseTaskService.insertByBo(bo));
}
/**
* 新增采购计划
*/
@Log(title = "采购计划", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping("/insert")
public R<Void> addBatch(@RequestBody List<SysOaWarehouseTaskBo> boList) {
return toAjax(iSysOaWarehouseTaskService.addBatch(boList));
}
/**
* 修改采购计划
*/
@Log(title = "采购计划", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaWarehouseTaskBo bo) {
return toAjax(iSysOaWarehouseTaskService.updateByBo(bo));
}
/**
* 删除采购计划
*
* @param taskIds 主键串
*/
@DeleteMapping("/{taskIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] taskIds) {
return toAjax(iSysOaWarehouseTaskService.deleteWithValidByIds(Arrays.asList(taskIds), true));
}
}