From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
index 8dd51eb..4a6b30a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
@@ -39,14 +39,6 @@
@Autowired
private FinishedInspectService finishedInspectService;
- @Autowired
- private UserService userService;
-
- @Autowired
- private SpecificationsService specificationsService;
-
- @Autowired
- private MaterialService materialService;
@Autowired
Jwt jwt;
@@ -70,17 +62,18 @@
@ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "number", value = "涓嶅悎鏍兼暟閲�", dataTypeClass = Integer.class)
})
@PostMapping("/updateFinishInspectsById")
- public Result updateFinishInspectsById(@RequestHeader("token") String token, Integer id) throws Exception {
+ public Result updateFinishInspectsById(@RequestHeader("token") String token, Integer id,Integer number) throws Exception {
//濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
FinishedInspect finishedInspect = finishedInspectService.getById(id);
if (ObjectUtils.isNotEmpty(finishedInspect.getResult())) {
return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
}
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
- return Result.success(finishedInspectService.updateFinishInspectsById(data.get("name").replaceAll("\"", ""), id));
+ return Result.success(finishedInspectService.updateFinishInspectsById(data.get("name").replaceAll("\"", ""), id,number));
}
@ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ鎴愬搧妫�楠屽崟璇︽儏")
@@ -94,14 +87,14 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ鎴愬搧妫�楠屽崟鍒楄〃")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "result", value = "妫�楠岀粨鏋�(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "material", value = "浜у搧鍚嶇О", dataTypeClass = String.class)
})
@GetMapping("/list_page")
- public Result<?> list_page(Integer pageNo, Integer pageSize, Integer result, String material) {
- IPage<Map<String, Object>> page = finishedInspectService.selectFinishedInspectPage(new Page<Object>(pageNo, pageSize), result, material);
+ public Result<?> list_page(Integer pageSize, Integer countSize, Integer result, String material) {
+ IPage<Map<String, Object>> page = finishedInspectService.selectFinishedInspectPage(new Page<Object>(pageSize, countSize), result, material);
Map<String, Object> map = new HashMap<>();
map.put("total", page.getTotal());
map.put("row", page.getRecords());
--
Gitblit v1.9.3