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/WkOrderItemController.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
index ec1d805..21d0fd1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -14,15 +16,15 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.FieldsUtils;
-import com.vincent.rsf.server.manager.entity.WkOrder;
-import com.vincent.rsf.server.manager.entity.WkOrderItem;
-import com.vincent.rsf.server.manager.entity.Companys;
+import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.mapper.AsnOrderItemMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.CompanysService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -32,7 +34,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,6 +51,9 @@
@Autowired
private CompanysService companysService;
+ @Resource
+ private AsnOrderItemMapper asnOrderItemMapper;
+
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
@@ -104,6 +110,19 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
+ @PostMapping("/asnOrderItemFull/in/page")
+ public R pageInFull(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true, null, "create_time", "mi");
+ wrapper.eq("mo.type", OrderType.ORDER_IN.type);
+
+ IPage<InOrderAndItem> page = asnOrderItemMapper.queryFullOrderWithPaging(pageParam, wrapper);
+ return R.ok(page);
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
@PostMapping("/asnOrderItem/out/page")
public R pageOut(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
@@ -137,21 +156,34 @@
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍑哄簱鍒楄〃")
+ @PostMapping("/asnOrderItemFull/out/page")
+ public R pageOutFull(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<WkOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, WkOrderItem.class);
+ QueryWrapper<WkOrderItem> wrapper = pageParam.buildWrapper(true, null, "create_time", "mi");
+ wrapper.eq("mo.type", OrderType.ORDER_OUT.type);
+
+ IPage<OutOrderAndItem> page = asnOrderItemMapper.queryFullOutOrderWithPaging(pageParam, wrapper);
+ return R.ok(page);
+ }
+
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/asnOrderItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(asnOrderItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderItemService.list()));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping({ "/asnOrderItem/many/{ids}", "/asnOrderItems/many/{ids}" })
public R many(@PathVariable Long[] ids) {
- return R.ok().add(asnOrderItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@GetMapping("/asnOrderItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(asnOrderItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(asnOrderItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
@@ -187,7 +219,7 @@
if (!asnOrderItemService.updateById(wkOrderItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(wkOrderItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(wkOrderItem));
}
@PreAuthorize("hasAuthority('manager:asnOrder:remove')")
@@ -197,7 +229,7 @@
if (!asnOrderItemService.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:asnOrder:list')")
@@ -210,7 +242,7 @@
}
asnOrderItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId())));
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
--
Gitblit v1.9.1