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/InspectUnacceptedController.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 114 insertions(+), 4 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 e3b2c13..4a54ccd 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,22 @@
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;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -21,7 +27,7 @@
* @author zss
* @since 2023-08-07 10:04:01
*/
-@Api(tags = "QMS绠＄悊-->涓嶅悎鏍煎搧")
+@Api(tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@RestController
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {
@@ -29,8 +35,13 @@
@Autowired
private InspectUnacceptedService inspectUnacceptedService;
+ @Autowired
+ private Jwt jwt;
- @ApiOperation(value = "鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃")
+ @Autowired
+ private OpinionService opinionService;
+
+ @ApiOperation(value = "鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
@@ -38,12 +49,111 @@
@ApiImplicitParam(name = "dealState",value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)",dataTypeClass = Integer.class)
})
@GetMapping("/selectUnRawInspectsList")
- public Result selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
+ public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState);
Map<String, Object> map = new HashMap<>();
map.put("total", inspectionPage.getTotal());
map.put("row", inspectionPage.getRecords());
return Result.success(map);
}
+
+ @ApiOperation(value = "鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃", tags = "QMS绠＄悊-->鍘熸潗鏂欎笉鍚堟牸鍝�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "formTime",value = "鏉ユ枡鏃ユ湡",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "productName",value = "浜у搧鍚嶇О",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "supplier",value = "渚涘簲鍟�",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "processingStatus",value = "澶勭悊鐘舵��",dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectURawMaterials")
+ public Result<?> selectUnqualifiedRawMaterials(int pageSize,
+ int countSize,
+ String formTime,
+ String productName,
+ String supplier,
+ Integer processingStatus){
+ IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnqualifiedRawMaterials(
+ new Page<Object>(pageSize, countSize),
+ formTime,
+ productName,
+ supplier,
+ processingStatus);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", inspectionPage.getTotal());
+ map.put("row", inspectionPage.getRecords());
+ return Result.success(map);
+ }
+
+ @ApiOperation(value = "涓嶅悎鏍煎搧鍒嗛〉鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
+ @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 = Integer.class),
+ @ApiImplicitParam(name = "state",value = "鐘舵��",dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectDisposal")
+ public Result<?> selectDisposal(int pageSize,
+ int countSize,
+ String specificationModel,
+ String productName,
+ Integer productCategories,
+ Integer state){
+ IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectDisposal(
+ new Page<Object>(pageSize, countSize),
+ specificationModel,
+ productName,
+ productCategories,
+ state);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", inspectionPage.getTotal());
+ 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 {
+ MyUtil.PrintLog(opinion.toString());
+
+ 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) {
+ Integer isUpdateSuccess = inspectUnacceptedService.descriptionUpdate(rawUnacceptedId, tell);
+ if (isUpdateSuccess == 1) {
+ return Result.success("鏇存柊鎴愬姛");
+ }
+ return Result.fail("鏇存柊澶辫触");
+ }
+
+ @ApiOperation(value = "鐐瑰嚮缂栬緫鎰忚瑙﹀彂鏌ヨ", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "rawUnacceptedId",value = "涓嶅悎鏍煎搧澶勭疆Id",dataTypeClass = Integer.class,required = true)
+ })
+ @GetMapping("/clickEditing")
+ public Result<?> clickEditingTriggerQuery(@RequestParam("rawUnacceptedId") Integer rawUnacceptedId) {
+ return Result.success(opinionService.clickEditingTriggerQuery(rawUnacceptedId));
+ }
}
--
Gitblit v1.9.3