From f640ac6b781487c8a88c7715586e03933b7f0d00 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 26 八月 2025 16:40:05 +0800
Subject: [PATCH] 单据修改接口优化 单据删除接口优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 299 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 189 insertions(+), 110 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index c607f9d..acf0704 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -9,6 +9,9 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.dto.CheckDiffDto;
+import com.vincent.rsf.server.api.controller.erp.params.dto.TransferInfoDto;
+import com.vincent.rsf.server.api.controller.erp.params.dto.WkOrderDto;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
@@ -16,15 +19,19 @@
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
-import com.vincent.rsf.server.manager.service.impl.TransferItemServiceImpl;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.entity.DictType;
import com.vincent.rsf.server.system.entity.Fields;
-import com.vincent.rsf.server.system.service.FieldsItemService;
+import com.vincent.rsf.server.system.service.DictDataService;
+import com.vincent.rsf.server.system.service.DictTypeService;
import com.vincent.rsf.server.system.service.FieldsService;
+import com.vincent.rsf.server.system.service.impl.DictDataServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -51,8 +58,6 @@
@Autowired
private FieldsService fieldsService;
@Autowired
- private FieldsItemService fieldsItemService;
- @Autowired
private MatnrGroupService matnrGroupService;
@Autowired
private MatnrServiceImpl matnrService;
@@ -66,8 +71,6 @@
private DeliveryItemService deliveryItemService;
@Autowired
private LocService locService;
- @Autowired
- private LocItemService locItemService;
@Autowired
private WarehouseAreasService warehouseAreasService;
@Autowired
@@ -84,6 +87,14 @@
private ReviseLogService reviseLogService;
@Autowired
private ReviseLogItemService reviseLogItemService;
+ @Autowired
+ private CheckDiffService checkDiffService;
+ @Autowired
+ private CheckDiffItemService checkDiffItemService;
+ @Autowired
+ private DictDataService dictDataService;
+ @Autowired
+ private DictTypeService dictTypeService;
/**
@@ -93,7 +104,7 @@
* @version 1.0
*/
@Override
- @Transactional(rollbackFor = Exception.class)
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
public boolean syncPurchasee(List<OrderParams> orders) {
if (orders.isEmpty()) {
throw new CoolException("鍗曟嵁鍐呭涓嶈兘涓虹┖锛侊紒");
@@ -175,6 +186,7 @@
* @param matnrs
*/
@Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
public void syncMatnrs(List<BaseMatParms> matnrs) {
List<Matnr> syncMatnrs = new ArrayList<>();
if (!matnrs.isEmpty()) {
@@ -367,58 +379,49 @@
return R.ok();
}
-
+ /**
+ * @author Ryan
+ * @date 2025/8/26
+ * @description: 鍗曟嵁鍚屾
+ * @version 1.0
+ */
@Override
@Transactional(timeout = 60, rollbackFor = Exception.class)
- public R syncCheckOrder(SyncOrderParams syncOrders, Long loginUserId) {
- List<SyncOrdersItem> ordersItems = syncOrders.getItems();
- Map<String, List<SyncOrdersItem>> listMap = ordersItems.stream().collect(Collectors.groupingBy(SyncOrdersItem::getOrderCode));
- listMap.keySet().forEach(orderCode -> {
- WkOrder wkOrder = new WkOrder();
- String ruleCode = null;
- if (syncOrders.getType().equals(OrderType.ORDER_CHECK.type)) {
- ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, null);
- } else if (syncOrders.getType().equals(OrderType.ORDER_IN.type)) {
- ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, null);
- } else if (syncOrders.getType().equals(OrderType.ORDER_OUT.type)) {
- ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, null);
- } else if (syncOrders.getType().equals(OrderType.ORDER_REVISE.type)) {
- ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null);
- } else if (syncOrders.getType().equals(OrderType.ORDER_TRANSFER.type)) {
- ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null);
- }
-
- SyncOrdersItem ordersItem = listMap.get(orderCode).stream().findFirst().get();
- Double anfmes = listMap.get(orderCode).stream().mapToDouble(SyncOrdersItem::getAnfme).sum();
- wkOrder.setType(syncOrders.getType())
- .setWkType(OrderWorkType.getWorkType(ordersItem.getWkType()))
- .setAnfme(anfmes)
- .setPoCode(orderCode)
- .setPoId(ordersItem.getId())
- .setCode(ruleCode)
- .setId(null)
- .setCreateTime(new Date())
- .setUpdateTime(new Date())
- .setCreateBy(loginUserId)
- .setUpdateBy(loginUserId);
-
- if (!asnOrderService.save(wkOrder)) {
- throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
- }
-
- listMap.get(orderCode).forEach(order -> {
- WkOrderItem wkOrderItem = new WkOrderItem();
- BeanUtils.copyProperties(order, wkOrderItem);
- wkOrderItem.setOrderCode(wkOrder.getCode())
- .setOrderId(wkOrder.getId())
- .setId(null);
-
- if (!asnOrderItemService.save(wkOrderItem)) {
- throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
+ public R syncCheckOrder(List<SyncOrderParams> syncOrders, Long loginUserId) {
+ if (!syncOrders.isEmpty()) {
+ syncOrders.forEach(syncOrder -> {
+ WkOrder wkOrder = new WkOrder();
+ DictData one = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE)
+ .eq(DictData::getLabel, syncOrder.getWkType()), false);
+ if (Objects.isNull(one)) {
+ throw new CoolException("鍗曟嵁锛�" + syncOrder.getOrderNo() + ", 涓氬姟绫诲瀷涓嶅瓨鍦紒锛�");
}
+ wkOrder.setType(OrderWorkType.getOrderType(syncOrder.getWkType()))
+ .setWkType(OrderWorkType.getWorkType(syncOrder.getWkType()))
+ .setAnfme(syncOrder.getAnfme())
+ .setCode(syncOrder.getOrderNo())
+ .setArrTime(syncOrder.getArrTime())
+ .setId(null)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId);
+ if (!asnOrderService.save(wkOrder)) {
+ throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
+ List<SyncOrdersItem> ordersItems = syncOrder.getOrdersItems();
+ ordersItems.forEach(item -> {
+ WkOrderItem wkOrderItem = new WkOrderItem();
+ BeanUtils.copyProperties(item, wkOrderItem);
+ wkOrderItem.setOrderCode(wkOrder.getCode())
+ .setOrderId(wkOrder.getId())
+ .setId(null);
+ if (!asnOrderItemService.save(wkOrderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
});
- });
-
+ }
return R.ok();
}
@@ -430,17 +433,17 @@
*/
@Override
@Transactional(timeout = 60, rollbackFor = Exception.class)
- public R syncTransfer(SyncTransferParams transferParams) {
+ public R syncTransfer(SyncTransferParams transferParams, Long loginUserId) {
Transfer transfer = new Transfer();
WarehouseAreas warehouseAreas = warehouseAreasService
.getOne(new LambdaQueryWrapper<WarehouseAreas>()
- .eq(WarehouseAreas::getName, transfer.getOrgAreaName()));
+ .eq(WarehouseAreas::getName, transferParams.getOrgAreaName()));
if (Objects.isNull(warehouseAreas)) {
throw new CoolException("鍘熷簱鍖轰笉瀛樺湪锛侊紒");
}
WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
- .eq(WarehouseAreas::getName, transfer.getTarAreaName()));
+ .eq(WarehouseAreas::getName, transferParams.getTarAreaName()));
if (Objects.isNull(warehouseAreas1)) {
throw new CoolException("鐩爣搴撳尯涓嶅瓨鍦紒锛�");
}
@@ -454,6 +457,11 @@
.setTarAreaId(warehouseAreas1.getId())
.setTarWareName(warehouseAreas1.getWarehouseId$())
.setTarWareId(warehouseAreas1.getWarehouseId())
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null))
.setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val);
if (!transferService.save(transfer)) {
@@ -469,6 +477,10 @@
}
transferItem.setMatnrId(matnr.getId())
.setTransferId(transfer.getId())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
.setTransferCode(transfer.getCode());
if (!transferItemService.save(transferItem)) {
@@ -487,7 +499,7 @@
*/
@Override
@Transactional(timeout = 60, rollbackFor = Exception.class)
- public R syncLocRevise(SyncLocReviseParams reviseParams) {
+ public R syncLocRevise(SyncLocReviseParams reviseParams, Long loginUserId) {
LocRevise locRevise = new LocRevise();
if (Objects.isNull(reviseParams.getAreaName())) {
throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
@@ -498,7 +510,13 @@
if (Objects.isNull(warehouseAreas)) {
throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
}
- locRevise.setAreaName(locRevise.getAreaName())
+
+ locRevise.setAreaName(warehouseAreas.getName())
+ .setType(LocReviseType.getLocRevise(reviseParams.getType()))
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
.setAreaId(warehouseAreas.getId());
locRevise.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null));
@@ -506,22 +524,40 @@
throw new CoolException("搴撳瓨璋冩暣鍗曚繚瀛樺け璐ワ紒锛�");
}
- reviseParams.getItems().forEach(revise -> {
+ reviseParams.getReviseItems().forEach(revise -> {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, revise.getLocCode()));
ReviseLog reviseLog = new ReviseLog();
BeanUtils.copyProperties(loc, reviseLog);
- reviseLog.setReviseId(locRevise.getId()).setReviseCode(locRevise.getCode());
+ reviseLog.setReviseId(locRevise.getId())
+ .setLocCode(loc.getCode())
+ .setType(Integer.parseInt(loc.getType()))
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setReviseCode(locRevise.getCode());
if (!reviseLogService.save(reviseLog)) {
throw new CoolException("搴撳瓨璋冩暣鍗曚笉鑳戒负绌猴紒锛�");
}
revise.getItems().forEach(reviseItem -> {
ReviseLogItem logItem = new ReviseLogItem();
BeanUtils.copyProperties(reviseItem, logItem);
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, reviseItem.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
logItem.setLocId(loc.getId())
.setLocCode(loc.getCode())
.setId(null)
+ .setMaktx(matnr.getName())
+ .setMatnrCode(matnr.getCode())
+ .setMatnrId(matnr.getId())
+ .setReviseLogId(reviseLog.getId())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
.setReviseQty(reviseItem.getAnfme());
-
if (!reviseLogItemService.save(logItem)) {
throw new CoolException("璋冩暣搴撳瓨鏄庣粏淇濆瓨澶辫触锛侊紒");
}
@@ -539,42 +575,46 @@
*/
@Override
@Transactional(timeout = 60, rollbackFor = Exception.class)
- public R syncOrderUpdate(SyncOrderParams orders) {
- //鍏ュ簱鍗曚慨鏀�
- if (orders.getType().equals(OrderType.ORDER_IN.type)) {
- orders.getItems().forEach(orderItem -> {
- WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getType, OrderType.ORDER_IN.type)
- .eq(WkOrder::getCode, orderItem.getOrderCode()));
- if (Objects.isNull(order)) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
-
- if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode())
+ public R syncOrderUpdate(List<SyncOrderParams> orders) {
+ orders.forEach(order -> {
+ List<Short> list = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val,
+ AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
+ WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .in(WkOrder::getExceStatus, list)
+ .eq(WkOrder::getCode, order.getOrderNo()));
+ if (Objects.isNull(wkOrder)) {
+ throw new CoolException("璇风‘璁ゅ崟鎹細" + order.getOrderNo() + "鏄惁宸茬粡鎵ц鎴栨槸鍚﹀悓姝ワ紒锛�");
+ }
+ order.getOrdersItems().forEach(orderItem -> {
+ WkOrderItem wkOrderItem = asnOrderItemService.getOne(new LambdaUpdateWrapper<WkOrderItem>()
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
- .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
- .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
- throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
- }
-
- List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, order.getId()));
- if (orderItems.isEmpty()) {
- throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
- }
-
- Double summed = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
- order.setAnfme(summed);
-
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
+ .eq(WkOrderItem::getOrderCode, wkOrder.getCode()));
+ if (!Objects.isNull(wkOrderItem)) {
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderCode, wkOrder.getCode())
+ .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
+ .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
+ .eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
+ .set(WkOrderItem::getAnfme, orderItem.getAnfme()))) {
+ throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+ }
+ } else {
+ WkOrderItem wkOrderItem1 = new WkOrderItem();
+ BeanUtils.copyProperties(orderItem, wkOrderItem1);
+ wkOrderItem1.setOrderCode(wkOrder.getCode())
+ .setOrderId(wkOrder.getId());
+ if (!asnOrderItemService.save(wkOrderItem1)) {
+ throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
+ }
}
});
- } else {
-
- }
- return null;
+ wkOrder.setAnfme(order.getAnfme());
+ if (!asnOrderService.updateById(wkOrder)) {
+ throw new CoolException("涓诲崟鎹慨鏀瑰け璐ワ紒锛�");
+ }
+ });
+ return R.ok();
}
/**
@@ -587,24 +627,33 @@
@Transactional(timeout = 60, rollbackFor = Exception.class)
public R syncOrderDelete(List<SyncOrderParams> orders) {
orders.forEach(order -> {
- order.getItems().forEach(orderItem -> {
- WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getType, order.getType())
- .in(WkOrder::getExceStatus, Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val))
- .eq(WkOrder::getId, orderItem.getOrderId()));
- if (Objects.isNull(wkOrder)) {
- throw new CoolException("璁㈠崟锛�" + orderItem.getOrderCode() + "锛屽綋鍓嶇姸鎬侊紝涓嶅彲鎵ц鍒犻櫎鎿嶄綔锛侊紒");
- }
+ List<Short> list = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val,
+ AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
+ WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .in(WkOrder::getExceStatus, list)
+ .eq(WkOrder::getCode, order.getOrderNo()));
+ if (Objects.isNull(wkOrder)) {
+ throw new CoolException("璁㈠崟锛�" + wkOrder.getCode() + "锛屽綋鍓嶇姸鎬侊紝涓嶅彲鎵ц鍒犻櫎鎿嶄綔锛侊紒");
+ }
+ order.getOrdersItems().forEach(orderItem -> {
if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getMatnrId, orderItem.getMatnrId())
- .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
- .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()))) {
+ .eq(WkOrderItem::getMatnrCode, orderItem.getMatnrCode())
+ .eq(StringUtils.isNotEmpty(orderItem.getBatch()), WkOrderItem::getSplrBatch, orderItem.getBatch())
+ .eq(StringUtils.isNotEmpty(orderItem.getPlatItemId()), WkOrderItem::getPlatItemId, orderItem.getPlatItemId())
+ .eq(WkOrderItem::getOrderCode, wkOrder.getCode()))) {
throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
- List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderItem.getOrderId()));
+ List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
if (orderItems.isEmpty()) {
- if (!asnOrderService.removeById(orderItem.getOrderId())) {
+ if (!asnOrderService.removeById(wkOrder.getId())) {
throw new CoolException("鍗曟嵁鍒犻櫎澶辫触锛侊紒");
+ }
+ } else {
+ Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .eq(WkOrder::getId, wkOrder.getId())
+ .set(WkOrder::getAnfme, sum))) {
+ throw new CoolException("涓诲崟鏁伴噺淇敼澶辫触锛侊紒");
}
}
});
@@ -631,4 +680,34 @@
wkorderDto.setTransfer(transfer).setItems(orderItems);
return R.ok().add(wkorderDto);
}
+
+ /**
+ * @author Ryan
+ * @date 2025/8/22
+ * @description: 鐩樼偣宸紓鍗曞悓姝�
+ * @version 1.0
+ */
+ @Override
+ @Transactional(timeout = 60, rollbackFor = Exception.class)
+ public R syncCheckDiffs(SyncCheckDiffParams syncParams) {
+ List<CheckDiff> diffs = checkDiffService.list(new LambdaQueryWrapper<CheckDiff>()
+ .eq(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)
+ .in(CheckDiff::getOrderCode, syncParams.getDiffCode()));
+ if (diffs.isEmpty()) {
+ return R.ok();
+ }
+ List<CheckDiffDto> dtos = new ArrayList<>();
+ diffs.forEach(check -> {
+ CheckDiffDto checkDto = new CheckDiffDto();
+ CheckDiff checkDiff = new CheckDiff();
+ BeanUtils.copyProperties(check, checkDiff);
+ List<CheckDiffItem> items = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
+ .eq(CheckDiffItem::getCheckId, check.getId()));
+ checkDto.setItems(items)
+ .setCheckDiff(checkDiff);
+ dtos.add(checkDto);
+ });
+
+ return R.ok().add(dtos);
+ }
}
--
Gitblit v1.9.1