From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index 9b4779e..d1f325f 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -11,7 +11,7 @@
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.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
import com.ruoyi.lavorissue.pojo.LaborIssue;
@@ -52,24 +52,24 @@
@GetMapping("/listPage")
@Log(title = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, LaborIssue laborIssue){
+ public R<?> listPage(Page page, LaborIssue laborIssue){
IPage<LaborIssue> listPage = laborIssueService.listPage(page, laborIssue);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@GetMapping("/statisticsList")
@Log(title = "鍔充繚鍙戞斁-缁熻鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍔充繚鍙戞斁-缁熻鏌ヨ")
- public AjaxResult statisticsList(LaborIssue laborIssue){
+ public R<?> statisticsList(LaborIssue laborIssue){
List<Map<String, Object>> listPage = laborIssueService.statisticsList(laborIssue);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Log(title = "鍔充繚鍙戞斁-娣诲姞", businessType = BusinessType.INSERT)
@Operation(summary = "鍔充繚鍙戞斁-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody LaborIssue laborIssue){
+ public R<?> add(@RequestBody LaborIssue laborIssue){
String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
StartAndEndDateDto dateTime = DailyRedisCounter.getDateTime();
Long approveId = lavorIssueMapper.selectCount(new LambdaQueryWrapper<LaborIssue>()
@@ -84,32 +84,32 @@
laborIssue.setOrderNo(String.format("%03d", l + 1));
}
boolean save = laborIssueService.save(laborIssue);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
@Log(title = "鍔充繚鍙戞斁-淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "鍔充繚鍙戞斁-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody LaborIssue laborIssue){
+ public R<?> update(@RequestBody LaborIssue laborIssue){
boolean update = laborIssueService.updateById(laborIssue);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Log(title = "鍔充繚鍙戞斁-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍔充繚鍙戞斁-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
+ public R<?> delete(@RequestBody List<Long> ids){
boolean delete = laborIssueService.removeBatchByIds(ids);
- return delete ? AjaxResult.success() : AjaxResult.error();
+ return delete ? R.ok() : R.fail();
}
@GetMapping("/statistics")
@Operation(summary = "鍔充繚鍙戞斁-缁熻")
- public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
+ public R<?> statistics(StatisticsLaborIssue req) throws Exception {
StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
- return AjaxResult.success(statisticsLaborIssue);
+ return R.ok(statisticsLaborIssue);
}
--
Gitblit v1.9.3