From 2f50c3b23a14aa649e58c63d62862b6e0eada7ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 05 九月 2023 17:04:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 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 0d513ab..dd389f2 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,16 +3,24 @@
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.utils.RedisUtil;
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;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -28,6 +36,11 @@
@Autowired
private InspectUnacceptedService inspectUnacceptedService;
+ @Autowired
+ private Jwt jwt;
+
+ @Autowired
+ private OpinionService opinionService;
@ApiOperation(value = "鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@ApiImplicitParams(value = {
@@ -79,16 +92,16 @@
@ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "specificationModel",value = "瑙勬牸鍨嬪彿",dataTypeClass = String.class),
@ApiImplicitParam(name = "productName",value = "浜у搧鍚嶇О",dataTypeClass = String.class),
- @ApiImplicitParam(name = "productCategories",value = "浜у搧澶х被",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "productCategories",value = "浜у搧澶х被",dataTypeClass = Integer.class),
@ApiImplicitParam(name = "state",value = "鐘舵��",dataTypeClass = Integer.class)
})
@GetMapping("/selectDisposal")
public Result<?> selectDisposal(int pageSize,
- int countSize,
- String specificationModel,
- String productName,
- String productCategories,
- Integer state){
+ int countSize,
+ String specificationModel,
+ String productName,
+ Integer productCategories,
+ Integer state){
IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectDisposal(
new Page<Object>(pageSize, countSize),
specificationModel,
@@ -100,5 +113,42 @@
map.put("row", inspectionPage.getRecords());
return Result.success(map);
}
+
+ @ApiOperation(value = "缂栬緫鎰忚-->纭畾鎸夐挳", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @PostMapping("/addOpinion")
+ public Result<?> updateOpinion(@RequestHeader("token") String token, @Validated @RequestBody List<Opinion> opinion) throws Exception {
+ Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
+ String id = data.get("id").replaceAll("\"", "");
+ opinionService.updateOpinion(id, opinion);
+ 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),
+ @ApiImplicitParam(name = "tell",value = "鐜拌薄鎻忚堪",dataTypeClass = Integer.class,required = true)
+ })
+ @GetMapping("/descriptionUpdate")
+ public Result<?> descriptionUpdate(Integer rawUnacceptedId, String tell) {
+ return Result.success(inspectUnacceptedService.descriptionUpdate(rawUnacceptedId, tell));
+ }
+
+ @ApiOperation(value = "鐐瑰嚮缂栬緫鎰忚瑙﹀彂鏌ヨ", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "rawUnacceptedId",value = "涓嶅悎鏍煎搧澶勭疆Id",dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/clickEditing")
+ public Result<?> clickEditingTriggerQuery(Integer rawUnacceptedId) {
+ return Result.success(opinionService.clickEditingTriggerQuery(rawUnacceptedId));
+ }
}
--
Gitblit v1.9.3