From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java | 58 +++++++++++++---------------------------------------------
1 files changed, 13 insertions(+), 45 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
index 5b13799..3d06a1c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
@@ -14,6 +14,7 @@
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.service.CheckOrderItemService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
@@ -21,7 +22,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
/**
@@ -44,25 +45,26 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true);
- return R.ok().add(checkOrderItemService.page(pageParam, wrapper));
+ PageParam<WkOrderItem, BaseParam> page = checkOrderItemService.page(pageParam, wrapper);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping("/checkItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(checkOrderItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkOrderItemService.list()));
}
@PreAuthorize("hasAuthority('manager:check:list')")
@PostMapping({"/checkItem/many/{ids}", "/checkItem/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(checkOrderItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkOrderItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:check:list')")
@GetMapping("/checkItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(checkOrderItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkOrderItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:check:save')")
@@ -76,7 +78,7 @@
if (!checkOrderItemService.save(order)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(order);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(order));
}
@PreAuthorize("hasAuthority('manager:check:update')")
@@ -88,7 +90,7 @@
if (!checkOrderItemService.updateById(order)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(order);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(order));
}
@PreAuthorize("hasAuthority('manager:check:remove')")
@@ -98,7 +100,7 @@
if (!checkOrderItemService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:check:list')")
@@ -107,46 +109,12 @@
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<WkOrderItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(WkOrderItem::getAsnCode, condition);
+ wrapper.like(WkOrderItem::getOrderCode, condition);
}
checkOrderItemService.page(new Page<>(1, 20), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getAsnCode()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getOrderCode()))
);
- return R.ok().add(vos);
- }
-
- /**
- * @author Ryan
- * @date 2025/7/14
- * @description: 鐩樼偣鍗曞鍑�
- * @version 1.0
- */
- @PreAuthorize("hasAuthority('manager:check:list')")
- @PostMapping("/checkItem/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<WkOrderItem> orders = new ArrayList<>();
- if (!Objects.isNull(map.get("ids"))) {
- orders = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, map.get("ids")));
- } else {
- orders = checkOrderItemService.list();
- }
- ExcelUtil.build(ExcelUtil.create(orders, WkOrderItem.class), response);
- }
-
- /**
- * @author Ryan
- * @description 涓嬭浇妯℃澘
- * @param
- * @return
- * @time 2025/4/18 08:17
- */
- @PostMapping("/checkItem/template/download")
- @ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
- @PreAuthorize("hasAuthority('manager:check:update')")
- public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
- List<CheckOrderTemplate> list = Arrays.asList(template);
- ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
}
--
Gitblit v1.9.1