From c28d3bb363dde2afb44c168b93379b2bf6b1f67f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectionItemController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectionItemController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectionItemController.java
index e77f84b..fed0cf2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectionItemController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectionItemController.java
@@ -17,13 +17,13 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-08-01
*/
-@Api(tags = "QMS绠＄悊-->鎴愬搧妫�楠�")
+@Api(tags = "QMS绠＄悊-->鎴愬搧杩囩▼妫�楠岄」鐩�")
@RestController
@RequestMapping("/inspection-item")
public class InspectionItemController {
@@ -31,22 +31,35 @@
@Autowired
private InspectionItemService inspectionItemService;
+
@Autowired
private Jwt jwt;
@ApiOperation(value = "鏂板鎸夐挳-->2銆佹煡璇㈡墍鏈夋楠岄」鐩�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "finishInspectId",value = "鎴愬搧妫�楠屽崟Id",dataTypeClass = Integer.class,required = true)
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟Id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "绫诲瀷", dataTypeClass = Integer.class, required = true)
})
@GetMapping("/list_user")
- public Result<?> selectInspectionItem(Integer finishInspectId){
- List<InspectionItemDto> inspectionItemDto = inspectionItemService.selectInspectionItem(finishInspectId);
+ public Result<?> selectInspectionItem(Integer id, Integer type) {
+ List<InspectionItemDto> inspectionItemDto = inspectionItemService.selectInspectionItem(id,type);
return Result.success(inspectionItemDto);
}
- @ApiOperation(value = "鏂板鎸夐挳-->2銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�")
+ @ApiOperation(value = "鏂板妫�楠屽崟-->閫夋嫨璁惧")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "technologyId", value = "鍏宠仈鐨勫伐鑹鸿矾绾縤d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "father", value = "椤圭洰鐖跺悕绉�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "name", value = "椤圭洰鍚嶇О", dataTypeClass = String.class, required = true)
+ })
+ @GetMapping("/chooseDev")
+ public Result<?> chooseDev(Integer technologyId, String father, String name) {
+ return Result.success(inspectionItemService.chooseDev(technologyId,father,name));
+ }
+
+ @ApiOperation(value = "鏂板鎸夐挳-->2銆佹楠岄」鐩殑妫�楠屽��-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�")
@PostMapping("/lose_focus_update")
- public Result<?> addInspectionItem(@RequestHeader("token")String token, @RequestBody UpdateInspectionItemDto updateInspectionItemDto) throws Exception {
+ public Result<?> addInspectionItem(@RequestHeader("token") String token, @RequestBody UpdateInspectionItemDto updateInspectionItemDto) throws Exception {
Map<String, String> usernameMessage = jwt.readJWT(token);
Map<String, Object> usernameAndId = JackSonUtil.unmarshal(usernameMessage.get("data"), Map.class);
String name = usernameAndId.get("name").toString().replaceAll("\"", "");
@@ -57,10 +70,4 @@
return Result.success(map);
}
- @ApiOperation(value = "鏂板鎸夐挳-->2銆佹楠岄」鐩�-->璇曢獙璁惧涓嬫媺妗�")
- @GetMapping("/list_device")
- public Result<?> selectDeviceIdAndName(){
- List<Map<String, Object>> maps = inspectionItemService.selectDeviceIdAndName();
- return Result.success(maps);
- }
}
--
Gitblit v1.9.3