From b9e2c1619cf61bcd5f24b858fff738244d20566e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 05 九月 2023 17:04:29 +0800
Subject: [PATCH] 过程检验修改9-5
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 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 1be14f0..0d513ab 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
@@ -21,7 +21,6 @@
* @author zss
* @since 2023-08-07 10:04:01
*/
-@Api(tags = "QMS绠＄悊-->涓嶅悎鏍煎搧")
@RestController
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {
@@ -30,17 +29,72 @@
private InspectUnacceptedService inspectUnacceptedService;
- @ApiOperation(value = "鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃")
+ @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 = "type",value = "绫诲瀷(涓虹┖=鍘熸潗鏂�2)",dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "dealState",value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)",dataTypeClass = Integer.class)
})
@GetMapping("/selectUnRawInspectsList")
- public Result selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState,Integer type){
- IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState,type);
+ 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 = String.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){
+ 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());
--
Gitblit v1.9.3