From 208bb2f289ce8a7b59f587a9f57e24c0fc8a0ba6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:48:40 +0800
Subject: [PATCH] MOM系统-9-24 加班
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 44 ++++++++++++--------------------------------
1 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
index 7c686cf..940c536 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -3,18 +3,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.Opinion;
-import com.yuanchu.mom.service.OpinionService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
-import com.yuanchu.mom.utils.MyUtil;
import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import com.yuanchu.mom.service.InspectUnacceptedService;
@@ -37,9 +32,6 @@
@Autowired
private Jwt jwt;
-
- @Autowired
- private OpinionService opinionService;
@ApiOperation(value = "涓嶅悎鏍煎搧绠＄悊鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@ApiImplicitParams(value = {
@@ -131,25 +123,6 @@
return Result.success(map);
}
- @ApiOperation(value = "缂栬緫鎰忚-->纭畾鎸夐挳", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
- @PostMapping("/addOpinion")
- public Result<?> updateOpinion(@RequestHeader("token") String token, @RequestBody Map<String, Object> opinion) throws Exception {
- List<?> opinion1 = JackSonUtil.unmarshal(JackSonUtil.marshal(opinion.get("opinion")), List.class);
- Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
- String id = data.get("id").replaceAll("\"", "");
- opinionService.updateOpinion(id, opinion1);
- return Result.success("娣诲姞鎴愬姛锛�");
- }
-
- @ApiOperation(value = "鏌ョ湅缂栬緫鎰忚", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/viewEditorial")
- public Result<?> viewEditorialComments(Integer rawUnacceptedId) {
- return Result.success(opinionService.viewEditorialComments(rawUnacceptedId));
- }
-
@ApiOperation(value = "澶辩劍鏇存柊鐜板儚鎻忚堪", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true),
@@ -164,13 +137,20 @@
return Result.fail("鏇存柊澶辫触");
}
- @ApiOperation(value = "鐐瑰嚮缂栬緫鎰忚瑙﹀彂鏌ヨ", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @ApiOperation(value = "缂栬緫澶勭疆鎰忚纭畾鎸夐挳", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "opinionTell", value = "澶勭疆鎰忚", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "way", value = "澶勭悊鏂瑰紡", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "type", value = "涓嶅悎鏍肩被鍨�", dataTypeClass = Integer.class, required = true),
})
- @GetMapping("/clickEditing")
- public Result<?> clickEditingTriggerQuery(@RequestParam("rawUnacceptedId") Integer rawUnacceptedId) {
- return Result.success(opinionService.clickEditingTriggerQuery(rawUnacceptedId));
+ @PostMapping("/editDisposalOpinion")
+ public Result<?> editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
+ Integer isUpdateSuccess = inspectUnacceptedService.editDisposalOpinionConfirmation(rawUnacceptedId, opinionTell, way, type);
+ if (isUpdateSuccess == 1) {
+ return Result.success("缂栬緫鎴愬姛");
+ }
+ return Result.fail("缂栬緫澶辫触");
}
}
--
Gitblit v1.9.3