From 9a16d4675b22d0845158d0f07424f4bda2e39475 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 九月 2023 18:02:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index a4632f6..ea412f4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -1,16 +1,17 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
import com.yuanchu.mom.service.InspectUnacceptedService;
+import com.yuanchu.mom.vo.Result;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.HashMap;
import java.util.Map;
/**
@@ -27,8 +28,34 @@
//鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
@Override
- public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState) {
- return inspectUnacceptedMapper.selectInsList(page, formTime, dealState);
+ public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories) {
+ return inspectUnacceptedMapper.selectInsList(page, formTime, dealState, productCategories);
+ }
+
+ @Override
+ public IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus) {
+ return inspectUnacceptedMapper.selectUnqualifiedRawMaterials(page, formTime, productName, supplier, processingStatus);
+ }
+
+ @Override
+ public IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state) {
+ return inspectUnacceptedMapper.selectDisposal(page, specificationModel, productName, productCategories, state);
+ }
+
+ @Override
+ public Integer descriptionUpdate(Integer rawUnacceptedId, String tell) {
+ LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
+ .eq(InspectUnaccepted::getId, rawUnacceptedId)
+ .set(InspectUnaccepted::getTell, tell);
+ return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
+ }
+
+ @Override
+ public Integer rawEvaluate(Integer rawId, Integer passOrNo) {
+ LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
+ .eq(InspectUnaccepted::getId, rawId)
+ .set(InspectUnaccepted::getDealReasult, passOrNo)
+ .set(InspectUnaccepted::getDealState, passOrNo);
+ return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
}
-
--
Gitblit v1.9.3