From da895b2581bd76d7c4c2df17cca1817924530a02 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 五月 2026 13:03:27 +0800
Subject: [PATCH] fix(account): 客户开票申请不通过后，重新开票申请提示有重复出库单+付款申请同理
---
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index 2bb6cd7..ab27019 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -4,8 +4,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.dto.StaffOnJobExcelDto;
import com.ruoyi.staff.pojo.StaffContract;
@@ -27,7 +26,7 @@
@RestController
@RequestMapping("/staff/staffOnJob")
@Tag(name = "鍛樺伐鍙拌处")
-public class StaffOnJobController extends BaseController {
+public class StaffOnJobController {
@Resource
private IStaffOnJobService staffOnJobService;
@@ -40,8 +39,8 @@
* @return
*/
@GetMapping("/listPage")
- public R<?> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
- return R.ok(staffOnJobService.staffOnJobListPage(page, staffOnJob));
+ public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
}
/**
@@ -49,8 +48,8 @@
* @return
*/
@GetMapping("/list")
- public R<?> staffOnJobList(StaffOnJob staffOnJob) {
- return R.ok(staffOnJobService.staffOnJobList(staffOnJob));
+ public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
+ return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
}
/**
@@ -59,8 +58,8 @@
* @return
*/
@PostMapping("")
- public R<?> add(@RequestBody StaffOnJobDto staffOnJob) {
- return R.ok(staffOnJobService.add(staffOnJob));
+ public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
+ return AjaxResult.success(staffOnJobService.add(staffOnJob));
}
/**
@@ -69,8 +68,8 @@
* @return
*/
@PutMapping("/{id}")
- public R<?> update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
- return R.ok(staffOnJobService.update(id, staffOnJobDto));
+ public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+ return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
}
/**
@@ -79,11 +78,11 @@
* @return
*/
@DeleteMapping("/del")
- public R<?> delStaffOnJobs(@RequestBody List<Integer> ids) {
+ public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(staffOnJobService.delStaffOnJobs(ids));
+ return AjaxResult.success(staffOnJobService.delStaffOnJobs(ids));
}
/**
@@ -92,8 +91,8 @@
* @return
*/
@GetMapping("/{id}")
- public R<?> staffOnJobDetail(@PathVariable("id") Long id) {
- return R.ok(staffOnJobService.staffOnJobDetail(id));
+ public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
+ return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
}
/**
@@ -103,8 +102,8 @@
* @return
*/
@PostMapping("/renewContract/{id}")
- public R<?> renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
- return R.ok(staffOnJobService.renewContract(id, staffContract));
+ public AjaxResult renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
+ return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
}
@Operation(summary = "涓嬭浇妯℃澘")
@@ -119,12 +118,12 @@
*/
@PostMapping("/import")
@Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆", businessType = BusinessType.IMPORT)
- public R<?> importData(@RequestPart("file") MultipartFile file) {
+ public AjaxResult importData(@RequestPart("file") MultipartFile file) {
Boolean b = staffOnJobService.importData(file);
if (b) {
- return R.ok(null, "瀵煎叆鎴愬姛");
+ return AjaxResult.success("瀵煎叆鎴愬姛");
}
- return R.fail("瀵煎叆澶辫触");
+ return AjaxResult.error("瀵煎叆澶辫触");
}
/**
@@ -144,8 +143,8 @@
*/
@PostMapping("/exportCopy")
@Operation(summary = "word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
- public R<?> exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
- return R.ok(staffOnJobService.exportCopy(response, staffOnJob));
+ public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
+ return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
}
--
Gitblit v1.9.3