From 4ad61e4c257621124625a89853eaa8334a11b0be Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 11:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 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 7e5787a..fd02e38 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,7 +1,8 @@
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;
@@ -10,7 +11,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.HashMap;
import java.util.Map;
/**
@@ -25,25 +25,28 @@
@Resource
InspectUnacceptedMapper inspectUnacceptedMapper;
- //鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+ //鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
@Override
- public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer type) {
- if (type==null){
- type=2;//涓虹┖鏄師鏉愭枡2
- }
- switch (type) {
- case 2:
- //2鏄煡璇㈠師鏉愭枡涓嶅悎鏍煎搧
- return inspectUnacceptedMapper.selectUnRawInspectsList(page,formTime,dealState,2);
- case 1:
- //1鏄煡璇㈣繃绋嬩笉鍚堟牸鍝�
- return inspectUnacceptedMapper.selectInsList(page,formTime,dealState,1);
- case 0:
- //0鏄煡璇㈡垚鍝佷笉鍚堟牸鍝�
- return inspectUnacceptedMapper.selectInsList(page,formTime,dealState,0);
- default:
- return null;
- }
+ public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState) {
+ return inspectUnacceptedMapper.selectInsList(page, formTime, dealState);
+ }
+
+ @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);
}
}
--
Gitblit v1.9.3