From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
index b9427e9..41bc9b1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/QlyInspectController.java
@@ -13,30 +13,41 @@
import com.vincent.rsf.server.manager.controller.params.IsptOrderParam;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
+import com.vincent.rsf.server.manager.entity.QlyIsptItem;
import com.vincent.rsf.server.manager.service.QlyInspectService;
+import com.vincent.rsf.server.manager.service.QlyIsptItemService;
+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;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
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.*;
+@Slf4j
@Api(tags = "璐ㄦ淇℃伅")
@RestController
public class QlyInspectController extends BaseController {
@Autowired
private QlyInspectService qlyInspectService;
+ @Autowired
+ private QlyIsptItemService qlyIsptItemService;
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<QlyInspect, BaseParam> pageParam = new PageParam<>(baseParam, QlyInspect.class);
- return R.ok().add(qlyInspectService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<QlyInspect, BaseParam> page = qlyInspectService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PostMapping("/qlyInspect/all/save")
@@ -50,7 +61,7 @@
}
@PostMapping("/qlyInspect/reports")
- @ApiOperation("鑾峰彇宸蹭笂鎶ュ崟鎹槑缁�")
+ @ApiOperation("鑾峰彇鍙川妫�鍗曟嵁鏄庣粏")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
public R listByAsnCode(@RequestBody Map<String, Object> map) {
if (Objects.isNull(map)) {
@@ -62,7 +73,7 @@
@PostMapping("/qlyInspect/asn/list")
@ApiOperation("鑾峰彇寰呰川妫�鍗�")
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
- public R getUnInspect(@RequestBody Map<String, Object> map) {
+ public R getUnInspect(@RequestBody Map<String, String> map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -80,23 +91,22 @@
return qlyInspectService.saveSelected(param, loginUserId);
}
-
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(qlyInspectService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(qlyInspectService.list()));
}
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping({"/qlyInspect/many/{ids}", "/qlyInspects/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(qlyInspectService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(qlyInspectService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@GetMapping("/qlyInspect/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(qlyInspectService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(qlyInspectService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:qlyInspect:save')")
@@ -104,13 +114,21 @@
@PostMapping("/qlyInspect/save")
public R save(@RequestBody QlyInspect qlyInspect) {
qlyInspect.setCreateBy(getLoginUserId());
- qlyInspect.setCreateTime(new Date());
qlyInspect.setUpdateBy(getLoginUserId());
- qlyInspect.setUpdateTime(new Date());
- if (!qlyInspectService.save(qlyInspect)) {
+ if (!qlyInspectService.qlySave(qlyInspect)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(qlyInspect);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(qlyInspect));
+ }
+
+ @PreAuthorize("hasAuthority('manager:qlyInspect:update')")
+ @ApiOperation("瀹℃牳纭")
+ @PostMapping("/qlyInspect/verify/complate/{id}")
+ public R verifyComplate(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return qlyInspectService.verifyComplate(id);
}
@PreAuthorize("hasAuthority('manager:qlyInspect:update')")
@@ -122,17 +140,31 @@
if (!qlyInspectService.updateById(qlyInspect)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(qlyInspect);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(qlyInspect));
}
@PreAuthorize("hasAuthority('manager:qlyInspect:remove')")
@OperationLog("Delete 璐ㄦ淇℃伅")
@PostMapping("/qlyInspect/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
- if (!qlyInspectService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ if (Objects.isNull(ids) || ids.length < 1) {
+ return R.error("鑳芥暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("Delete Success").add(ids);
+ List<QlyInspect> qlyInspects = qlyInspectService.list(new LambdaQueryWrapper<QlyInspect>()
+ .in(QlyInspect::getId, ids)
+ .gt(QlyInspect::getIsptQty, 0)
+ );
+ if (!qlyInspects.isEmpty()) {
+ return R.error("鏈夋槑缁嗗崟鎹凡鍦ㄨ川妫�涓紒锛�");
+ }
+ if (!qlyInspectService.removeByIds(Arrays.asList(ids))) {
+ return R.error("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ }
+
+ if (!qlyIsptItemService.remove(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getIspectId, ids))) {
+ return R.error("鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@@ -146,13 +178,13 @@
qlyInspectService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getCode()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:qlyInspect:list')")
@PostMapping("/qlyInspect/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(qlyInspectService.list(), QlyInspect.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(qlyInspectService.list()), QlyInspect.class), response);
}
--
Gitblit v1.9.1