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 | 106 ++++++++++++++++++++++------------------------------
1 files changed, 45 insertions(+), 61 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 8d31020..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;
@@ -38,19 +33,17 @@
@Autowired
private Jwt jwt;
- @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),
- @ApiImplicitParam(name = "formTime",value = "鏉ユ枡鏃ユ湡",dataTypeClass = String.class),
- @ApiImplicitParam(name = "dealState",value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)",dataTypeClass = Integer.class)
+ @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 = "dealState", value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "productCategories", value = "浜у搧澶х被", dataTypeClass = Integer.class),
})
@GetMapping("/selectUnRawInspectsList")
- 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);
+ public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState, Integer productCategories) {
+ IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime, dealState, productCategories);
Map<String, Object> map = new HashMap<>();
map.put("total", inspectionPage.getTotal());
map.put("row", inspectionPage.getRecords());
@@ -59,20 +52,20 @@
@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)
+ @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){
+ int countSize,
+ String formTime,
+ String productName,
+ String supplier,
+ Integer processingStatus) {
IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnqualifiedRawMaterials(
new Page<Object>(pageSize, countSize),
formTime,
@@ -87,11 +80,14 @@
@ApiOperation(value = "璇勫", tags = "QMS绠＄悊-->鍘熸潗鏂欎笉鍚堟牸鍝�")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "rawId",value = "鍘熸潗鏂橧d",dataTypeClass = Integer.class,required = true),
- @ApiImplicitParam(name = "passOrNo",value = "鏄惁閫氳繃锛�0锛氫笉閫氳繃锛�1锛氶�氳繃",dataTypeClass = Integer.class,required = true)
+ @ApiImplicitParam(name = "rawId", value = "鍘熸潗鏂橧d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "passOrNo", value = "鏄惁閫氳繃锛�0锛氫笉閫氳繃锛�1锛氶�氳繃", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/evaluatePassOrNo")
- public Result<?> rawEvaluate(Integer rawId, Integer passOrNo){
+ public Result<?> rawEvaluate(Integer rawId, Integer passOrNo) {
+ if (inspectUnacceptedService.getById(rawId).getDealState() == 1) {
+ return Result.fail("宸茬粡璇勫杩囦簡涓嶈兘鍐嶆璇勫!");
+ }
Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo);
if (integer >= 1) {
return Result.success("璇勫鎴愬姛锛�");
@@ -101,12 +97,12 @@
@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)
+ @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,
@@ -114,7 +110,7 @@
String specificationModel,
String productName,
Integer productCategories,
- Integer state){
+ Integer state) {
IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectDisposal(
new Page<Object>(pageSize, countSize),
specificationModel,
@@ -127,29 +123,10 @@
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),
- @ApiImplicitParam(name = "tell",value = "鐜拌薄鎻忚堪",dataTypeClass = Integer.class,required = true)
+ @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) {
@@ -160,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