From d1ea726be5628c46fb6be700a0197002d55d39f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 13:14:24 +0800
Subject: [PATCH] 修改2.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 67 ---------------------------------
1 files changed, 1 insertions(+), 66 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 940c536..1f1a17f 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
@@ -30,71 +30,6 @@
@Autowired
private InspectUnacceptedService inspectUnacceptedService;
- @Autowired
- private Jwt jwt;
-
- @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 = "productCategories", value = "浜у搧澶х被", dataTypeClass = Integer.class),
- })
- @GetMapping("/selectUnRawInspectsList")
- 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());
- 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 = "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) {
- if (inspectUnacceptedService.getById(rawId).getDealState() == 1) {
- return Result.fail("宸茬粡璇勫杩囦簡涓嶈兘鍐嶆璇勫!");
- }
- Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo);
- if (integer >= 1) {
- return Result.success("璇勫鎴愬姛锛�");
- }
- return Result.fail("璇勫澶辫触锛�");
- }
-
@ApiOperation(value = "涓嶅悎鏍煎搧鍒嗛〉鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -142,7 +77,7 @@
@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),
+ @ApiImplicitParam(name = "type", value = "涓嶅悎鏍肩被鍨�", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/editDisposalOpinion")
public Result<?> editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
--
Gitblit v1.9.3