From 5a96b6b8174bf2c595e6c691b6ffc3a52970a0e7 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 19 七月 2025 13:36:05 +0800
Subject: [PATCH] 盘点差异单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckDiffItemController.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 1ccf55c..b3ddb91 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
@@ -1,16 +1,22 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
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.enums.CheckDiffExceStatus;
import com.vincent.rsf.server.manager.service.CheckDiffItemService;
+import com.vincent.rsf.server.manager.service.CheckDiffService;
+import com.vincent.rsf.server.manager.service.impl.CheckDiffServiceImpl;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,14 +24,17 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class CheckDiffItemController extends BaseController {
@Autowired
private CheckDiffItemService checkDiffItemService;
+ @Autowired
+ private CheckDiffService checkDiffService;
- @PreAuthorize("hasAuthority('manager:checkDiffItem:list')")
+ @PreAuthorize("hasAuthority('manager:checkDiff:list')")
@PostMapping("/checkDiffItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
@@ -33,25 +42,25 @@
return R.ok().add(checkDiffItemService.page(pageParam, pageParam.buildWrapper(true)));
}
- @PreAuthorize("hasAuthority('manager:checkDiffItem:list')")
+ @PreAuthorize("hasAuthority('manager:checkDiff:list')")
@PostMapping("/checkDiffItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(checkDiffItemService.list());
}
- @PreAuthorize("hasAuthority('manager:checkDiffItem: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)));
}
- @PreAuthorize("hasAuthority('manager:checkDiffItem:list')")
+ @PreAuthorize("hasAuthority('manager:checkDiff:list')")
@GetMapping("/checkDiffItem/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(checkDiffItemService.getById(id));
}
- @PreAuthorize("hasAuthority('manager:checkDiffItem:save')")
+ @PreAuthorize("hasAuthority('manager:checkDiff:save')")
@OperationLog("Create 鐩樼偣鏄庣粏宸紓琛�")
@PostMapping("/checkDiffItem/save")
public R save(@RequestBody CheckDiffItem checkDiffItem) {
@@ -65,7 +74,7 @@
return R.ok("Save Success").add(checkDiffItem);
}
- @PreAuthorize("hasAuthority('manager:checkDiffItem:update')")
+ @PreAuthorize("hasAuthority('manager:checkDiff:update')")
@OperationLog("Update 鐩樼偣鏄庣粏宸紓琛�")
@PostMapping("/checkDiffItem/update")
public R update(@RequestBody CheckDiffItem checkDiffItem) {
@@ -74,10 +83,31 @@
if (!checkDiffItemService.updateById(checkDiffItem)) {
return R.error("Update Fail");
}
+
+ List<CheckDiffItem> diffItems = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getCheckId, checkDiffItem.getCheckId()));
+ 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 (!checkDiffService.update(new LambdaUpdateWrapper<CheckDiff>()
+ .eq(CheckDiff::getId, checkDiffItem.getCheckId())
+ .set(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val))) {
+ throw new CoolException("鐩樼偣鍗曠姸鎬佹洿鏂板け璐ワ紒锛�");
+ }
+ } else {
+ if (!checkDiffService.update(new LambdaUpdateWrapper<CheckDiff>()
+ .eq(CheckDiff::getId, checkDiffItem.getCheckId())
+ .set(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_HOLD.val))) {
+ throw new CoolException("鐩樼偣鍗曠姸鎬佹洿鏂板け璐ワ紒锛�");
+ }
+ }
+ }
+
+
return R.ok("Update Success").add(checkDiffItem);
}
- @PreAuthorize("hasAuthority('manager:checkDiffItem:remove')")
+ @PreAuthorize("hasAuthority('manager:checkDiff:remove')")
@OperationLog("Delete 鐩樼偣鏄庣粏宸紓琛�")
@PostMapping("/checkDiffItem/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
@@ -87,7 +117,7 @@
return R.ok("Delete Success").add(ids);
}
- @PreAuthorize("hasAuthority('manager:checkDiffItem:list')")
+ @PreAuthorize("hasAuthority('manager:checkDiff:list')")
@PostMapping("/checkDiffItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
@@ -101,7 +131,7 @@
return R.ok().add(vos);
}
- @PreAuthorize("hasAuthority('manager:checkDiffItem:list')")
+ @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);
--
Gitblit v1.9.1