From dc9c6c612cde7b938c6851383b9da99abab025a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:02:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 57 +++++++++++++++++++++++++++------------------------------
1 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index f0c861a..d1f325f 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -11,21 +11,22 @@
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;
import com.ruoyi.lavorissue.service.LavorIssueService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.mapper.SysDeptMapper;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -39,40 +40,36 @@
* @date : 2025/8/13 11:19
*/
@RestController
-@Api(tags = "鍔充繚鍙戞斁")
+@Tag(name = "鍔充繚鍙戞斁")
@RequestMapping("/lavorIssue")
+@AllArgsConstructor
public class LavorIssueController extends BaseController {
- @Autowired
private LavorIssueService laborIssueService;
-
- @Autowired
private LavorIssueMapper lavorIssueMapper;
-
- @Autowired
private SysDeptMapper sysDeptMapper;
@GetMapping("/listPage")
@Log(title = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, LaborIssue laborIssue){
+ @Operation(summary = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
+ 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)
- @ApiOperation("鍔充繚鍙戞斁-缁熻鏌ヨ")
- public AjaxResult statisticsList(LaborIssue laborIssue){
+ @Operation(summary = "鍔充繚鍙戞斁-缁熻鏌ヨ")
+ 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)
- @ApiOperation("鍔充繚鍙戞斁-娣诲姞")
+ @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>()
@@ -87,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)
- @ApiOperation("鍔充繚鍙戞斁-淇敼")
+ @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)
- @ApiOperation("鍔充繚鍙戞斁-鍒犻櫎")
+ @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")
- @ApiOperation("鍔充繚鍙戞斁-缁熻")
- public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
+ @Operation(summary = "鍔充繚鍙戞斁-缁熻")
+ public R<?> statistics(StatisticsLaborIssue req) throws Exception {
StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
- return AjaxResult.success(statisticsLaborIssue);
+ return R.ok(statisticsLaborIssue);
}
@@ -122,7 +119,7 @@
*/
@Log(title = "鍔充繚鍙戞斁-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("鍔充繚鍙戞斁-瀵煎嚭")
+ @Operation(summary = "鍔充繚鍙戞斁-瀵煎嚭")
public void export(HttpServletResponse response) {
Long tenantId = SecurityUtils.getLoginUser().getTenantId();
ExcelUtil<LaborIssue> util = new ExcelUtil<LaborIssue>(LaborIssue.class);
@@ -142,7 +139,7 @@
*/
@Log(title = "鍔充繚鍙戞斁-瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/exportCopy")
- @ApiOperation("鍔充繚鍙戞斁-瀵煎嚭")
+ @Operation(summary = "鍔充繚鍙戞斁-瀵煎嚭")
public void exportCopy(HttpServletResponse response,LaborIssue laborIssue) throws UnsupportedEncodingException {
laborIssueService.exportCopy(response,laborIssue);
}
--
Gitblit v1.9.3