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/CheckDiffItemController.java | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java
index b3ddb91..db6d6c4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java
@@ -13,16 +13,20 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.CheckDiff;
import com.vincent.rsf.server.manager.entity.CheckDiffItem;
+import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.enums.CheckDiffExceStatus;
+import com.vincent.rsf.server.manager.enums.CheckExceStatus;
import com.vincent.rsf.server.manager.service.CheckDiffItemService;
import com.vincent.rsf.server.manager.service.CheckDiffService;
+import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.manager.service.impl.CheckDiffServiceImpl;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
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.*;
import java.util.stream.Collectors;
@@ -33,31 +37,34 @@
private CheckDiffItemService checkDiffItemService;
@Autowired
private CheckDiffService checkDiffService;
+ @Autowired
+ private CheckOrderService checkOrderService;
@PreAuthorize("hasAuthority('manager:checkDiff:list')")
@PostMapping("/checkDiffItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<CheckDiffItem, BaseParam> pageParam = new PageParam<>(baseParam, CheckDiffItem.class);
- return R.ok().add(checkDiffItemService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<CheckDiffItem, BaseParam> page = checkDiffItemService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:checkDiff:list')")
@PostMapping("/checkDiffItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(checkDiffItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkDiffItemService.list()));
}
@PreAuthorize("hasAuthority('manager:checkDiff:list')")
@PostMapping({"/checkDiffItem/many/{ids}", "/checkDiffItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(checkDiffItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkDiffItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:checkDiff:list')")
@GetMapping("/checkDiffItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(checkDiffItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(checkDiffItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:checkDiff:save')")
@@ -71,7 +78,7 @@
if (!checkDiffItemService.save(checkDiffItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(checkDiffItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(checkDiffItem));
}
@PreAuthorize("hasAuthority('manager:checkDiff:update')")
@@ -88,11 +95,23 @@
if (!diffItems.isEmpty()) {
Map<Integer, List<CheckDiffItem>> listMap = diffItems.stream().collect(Collectors.groupingBy(CheckDiffItem::getExceStatus));
List<CheckDiffItem> checkDiffItems = listMap.get(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val);
- if (diffItems.size() == checkDiffItems.size()) {
+ if (checkDiffItems != null && diffItems.size() == checkDiffItems.size()) {
if (!checkDiffService.update(new LambdaUpdateWrapper<CheckDiff>()
.eq(CheckDiff::getId, checkDiffItem.getCheckId())
.set(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val))) {
throw new CoolException("鐩樼偣鍗曠姸鎬佹洿鏂板け璐ワ紒锛�");
+ }
+ // 浠呭湪鏈夊崟鏃舵洿鏂扮洏鐐瑰崟(WkOrder)鎵ц鐘舵�侊紱鏃犲崟鐩樼偣鏃犵洏鐐瑰崟锛屼笉鏇存柊
+ CheckDiff checkDiff = checkDiffService.getById(checkDiffItem.getCheckId());
+ if (checkDiff != null && checkDiff.getOrderId() != null) {
+ WkOrder order = checkOrderService.getById(checkDiff.getOrderId());
+ if (order == null) {
+ throw new CoolException("鐩樼偣鍗曚笉瀛樺湪锛侊紒");
+ }
+ order.setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_DONE.val);
+ if (!checkOrderService.updateById(order)) {
+ throw new CoolException("鐩樼偣鍗曟墽琛岀姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
}
} else {
if (!checkDiffService.update(new LambdaUpdateWrapper<CheckDiff>()
@@ -102,9 +121,7 @@
}
}
}
-
-
- return R.ok("Update Success").add(checkDiffItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(checkDiffItem));
}
@PreAuthorize("hasAuthority('manager:checkDiff:remove')")
@@ -114,7 +131,7 @@
if (!checkDiffItemService.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:checkDiff:list')")
@@ -128,13 +145,13 @@
checkDiffItemService.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:checkDiff:list')")
@PostMapping("/checkDiffItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(checkDiffItemService.list(), CheckDiffItem.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(checkDiffItemService.list()), CheckDiffItem.class), response);
}
}
--
Gitblit v1.9.1