From 3625accd261feb99a6927013d7551a08d68c756e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 19 九月 2023 15:01:58 +0800
Subject: [PATCH] 修改 9.19
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 71 +++++++++++++++++++++++++----------
1 files changed, 51 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..1146807 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,22 @@
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.mapper.OpinionMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
+import com.yuanchu.mom.pojo.Opinion;
import com.yuanchu.mom.service.InspectUnacceptedService;
+import com.yuanchu.mom.service.OpinionService;
+import com.yuanchu.mom.vo.Result;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -25,25 +31,50 @@
@Resource
InspectUnacceptedMapper inspectUnacceptedMapper;
- //鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+ @Resource
+ OpinionService opinionService;
+
+ //鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
@Override
- public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer type) {
- if (type==null){
- type=2;//涓虹┖鏄師鏉愭枡2
+ 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);
+ //濡傛灉鏄瘎瀹′笉閫氳繃鍒欐柊澧炰笉鍚堟牸澶勭悊鎰忚琛�
+ if (passOrNo==0) {
+ List<Opinion> opinions = new ArrayList<>();
+ for (int i = 0; i <= 3; i++) {
+ Opinion opinion = new Opinion();
+ opinion.setType(i);
+ opinion.setRawUnacceptedId(rawId);
+ opinions.add(opinion);
+ }
+ opinionService.saveBatch(opinions);
}
- 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;
- }
+ return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
}
-
--
Gitblit v1.9.3