From 51786b723d0a91d11476776d9ce50af7994dc4bd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 23 九月 2026 15:58:53 +0800
Subject: [PATCH] feat(inspect): 完善检验订单状态管理和样品接收流程
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java | 137 ++++++++++++++++++++++++++++++++-------------
1 files changed, 96 insertions(+), 41 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
index ee516b8..7b0c053 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessTotaldealServiceImpl.java
@@ -15,16 +15,19 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
+import com.ruoyi.inspect.mapper.InsOrderMapper;
+import com.ruoyi.inspect.mapper.InsSampleMapper;
+import com.ruoyi.inspect.mapper.InsSampleReceiptMapper;
+import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.pojo.InsSample;
+import com.ruoyi.inspect.pojo.InsSampleReceipt;
import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.inspect.util.UserUtils;
+import org.apache.commons.lang3.StringUtils;
import com.ruoyi.process.dto.ProcessDealDto;
-import com.ruoyi.process.mapper.InspectionOrderMapper;
import com.ruoyi.process.mapper.ProcessDealMapper;
-import com.ruoyi.process.mapper.ProcessSampleMapper;
import com.ruoyi.process.mapper.ProcessTotaldealMapper;
-import com.ruoyi.process.pojo.InspectionOrder;
import com.ruoyi.process.pojo.ProcessDeal;
-import com.ruoyi.process.pojo.ProcessSample;
import com.ruoyi.process.pojo.ProcessTotaldeal;
import com.ruoyi.process.service.ProcessDealService;
import com.ruoyi.process.service.ProcessTotaldealService;
@@ -44,12 +47,17 @@
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -67,13 +75,7 @@
private ProcessTotaldealMapper processTotaldealMapper;
@Resource
- private ProcessSampleMapper processSampleMapper;
-
- @Resource
private ProcessDealService processDealService;
-
- @Resource
- private InspectionOrderMapper inspectionOrderMapper;
@Resource
private ProcessDealMapper processDealMapper;
@@ -84,6 +86,15 @@
@Resource
private UserMapper userMapper;
+
+ @Resource
+ private InsOrderMapper insOrderMapper;
+
+ @Resource
+ private InsSampleMapper insSampleMapper;
+
+ @Resource
+ private InsSampleReceiptMapper insSampleReceiptMapper;
@Override
public IPage<ProcessTotaldeal> pageProcessTotaldeal(Page page, ProcessTotaldeal processTotaldeal) {
@@ -139,49 +150,93 @@
@Override
public int addProcessTotaldeal(String month) {
- //鏂板鎬昏〃
- ProcessTotaldeal processTotaldeal = new ProcessTotaldeal();
+ //鏂板鎬昏〃锛堝悓涓�鏈堜唤澶嶇敤宸叉湁鎬昏〃锛�
+ ProcessTotaldeal processTotaldeal;
List<ProcessTotaldeal> processTotaldeals = processTotaldealMapper.selectList(Wrappers.<ProcessTotaldeal>lambdaQuery()
.eq(ProcessTotaldeal::getMonth, month));
- if (processTotaldeals.size()<=0) {
+ if (processTotaldeals.size() <= 0) {
+ processTotaldeal = new ProcessTotaldeal();
processTotaldeal.setMonth(month);//鏈堜唤
processTotaldeal.setSubmitState("寰呮彁浜�");
processTotaldealMapper.insert(processTotaldeal);
- }else {
- processTotaldeal=processTotaldeals.get(0);
+ } else {
+ processTotaldeal = processTotaldeals.get(0);
}
- //鏂板璇︽儏琛�
//1.鑾峰彇璇ユ湀浠界殑绗竴澶╁拰鏈�鍚庝竴澶�
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
YearMonth yearMonth = YearMonth.parse(month, formatter);
- LocalDate firstDay = yearMonth.atDay(1);
- LocalDate lastDay = yearMonth.atEndOfMonth();
- //2.鏌ヨ鍦ㄨ繖涓椂闂磋寖鍥村唴鐨勬墍鏈夋牱鍝佺櫥璁扮殑鏁版嵁
- List<ProcessSample> processSamples = processSampleMapper.selectList(Wrappers.<ProcessSample>lambdaQuery()
- .between(ProcessSample::getLeaveDate, firstDay, lastDay));
- if (processSamples.size()>0){
- //鑾峰彇澶勭悊鏂瑰紡
- InspectionOrder inspectionOrder = inspectionOrderMapper.selectById(processSamples.get(0).getInspectionOrderId());
- List<ProcessDeal> processDeals = new ArrayList<>();
- for (ProcessSample processSample : processSamples) {
- long count = processDealService.count(Wrappers.<ProcessDeal>lambdaQuery().eq(ProcessDeal::getProcessSampleId, processSample.getId()));
- if (count>0){
- continue;
- }
- ProcessDeal processDeal = new ProcessDeal();
- processDeal.setSampleName(processSample.getSampleName());//鏍峰搧鍚嶇О
- processDeal.setSampleCode(processSample.getSampleCode());//鏍峰搧缂栧彿
- processDeal.setSampleSupplier(processSample.getSampleSupplier());//渚涙牱鍗曚綅
- processDeal.setNum(processSample.getNum());//鏍峰搧鏁伴噺
- processDeal.setDealMethod(inspectionOrder.getProcessing()==1?"瀹為獙瀹ゅ鐞�":"濮旀墭鍗曚綅鍙栧洖");//澶勭悊鏂瑰紡
- processDeal.setDealTime(LocalDate.now());//鏃堕棿=褰撳墠鏃堕棿
- processDeal.setTotaldealId(processTotaldeal.getId());//鎬昏〃id
- processDeal.setProcessSampleId(processSample.getId());//鏍峰搧鎺ユ敹id
- processDeals.add(processDeal);
+ LocalDateTime startTime = yearMonth.atDay(1).atStartOfDay();
+ LocalDateTime endTime = yearMonth.atEndOfMonth().atTime(LocalTime.MAX);
+ //2.璇ユ湀涓嬪崟鐨勫鎵樺崟锛堟帓闄ゅ師鏉愭枡锛宼ypeSource 涓虹┖瑙嗕负鎴愬搧锛�
+ List<InsOrder> orders = insOrderMapper.selectList(Wrappers.<InsOrder>lambdaQuery()
+ .ge(InsOrder::getCreateTime, startTime)
+ .le(InsOrder::getCreateTime, endTime));
+ if (orders.isEmpty()) {
+ return 0;
+ }
+ //3.鍙繚鐣欏凡鐢熸垚鏍峰搧鎺ユ敹璁板綍鐨勫鎵橈紙宸插鏍稿彈鐞嗭級
+ List<Integer> orderIds = orders.stream().map(InsOrder::getId).collect(Collectors.toList());
+ List<InsSampleReceipt> receipts = insSampleReceiptMapper.selectList(Wrappers.<InsSampleReceipt>lambdaQuery()
+ .in(InsSampleReceipt::getInsOrderId, orderIds));
+ Set<Integer> receiptOrderIds = receipts.stream().map(InsSampleReceipt::getInsOrderId).collect(Collectors.toSet());
+ Map<Integer, InsOrder> orderMap = orders.stream()
+ .filter(order -> !Integer.valueOf(1).equals(order.getTypeSource()))
+ .filter(order -> receiptOrderIds.contains(order.getId()))
+ .collect(Collectors.toMap(InsOrder::getId, order -> order, (a, b) -> a));
+ if (orderMap.isEmpty()) {
+ return 0;
+ }
+ //4.濮旀墭瀵瑰簲鐨勬牱鍝�
+ List<InsSample> samples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
+ .in(InsSample::getInsOrderId, orderMap.keySet()));
+ if (samples.isEmpty()) {
+ return 0;
+ }
+ //5.宸茶繘鍏ヤ换浣曞缃壒娆＄殑鏍峰搧璺宠繃锛堣法鏈堜篃涓嶄細閲嶅甯﹀叆锛�
+ List<Integer> sampleIds = samples.stream().map(InsSample::getId).collect(Collectors.toList());
+ Set<Integer> dealtSampleIds = processDealService.list(Wrappers.<ProcessDeal>lambdaQuery()
+ .select(ProcessDeal::getInsSampleId)
+ .in(ProcessDeal::getInsSampleId, sampleIds))
+ .stream().map(ProcessDeal::getInsSampleId).filter(Objects::nonNull).collect(Collectors.toSet());
+ List<ProcessDeal> processDeals = new ArrayList<>();
+ for (InsSample insSample : samples) {
+ if (dealtSampleIds.contains(insSample.getId())) {
+ continue;
}
+ InsOrder order = orderMap.get(insSample.getInsOrderId());
+ ProcessDeal processDeal = new ProcessDeal();
+ //鏍峰搧鍚嶇О浼樺厛鍙栨姤鍛婂睍绀哄瓧娈�
+ processDeal.setSampleName(order != null && StringUtils.isNotBlank(order.getSampleView())
+ ? order.getSampleView() : insSample.getSample());
+ processDeal.setSampleCode(insSample.getSampleCode());//鏍峰搧缂栧彿
+ processDeal.setSampleSupplier(order == null ? null : order.getCompany());//渚涙牱鍗曚綅=濮旀墭鍗曚綅
+ processDeal.setNum(insSample.getQuantity() == null ? 1 : insSample.getQuantity());//鏍峰搧鏁伴噺
+ processDeal.setDealMethod(resolveDealMethod(order));//澶勭悊鏂瑰紡=涓嬪崟鏃堕�夋嫨鐨勬牱鍝佸缃�
+ processDeal.setDealTime(LocalDate.now());//鏃堕棿=褰撳墠鏃堕棿
+ processDeal.setTotaldealId(processTotaldeal.getId());//鎬昏〃id
+ processDeal.setInsSampleId(insSample.getId());//妫�楠屾牱鍝乮d
+ processDeals.add(processDeal);
+ }
+ if (!processDeals.isEmpty()) {
processDealService.saveBatch(processDeals);
}
- return 0;
+ return processDeals.size();
+ }
+
+ /**
+ * 澶勭悊鏂瑰紡锛氫笅鍗曟椂鐨勬牱鍝佸缃� 1濮旀墭鏂瑰彇鍥� 2妫�娴嬫柟澶勭疆锛涘巻鍙插崟鏃犺瀛楁鏃跺洖閫�鏃х殑澶勭悊鏂瑰紡瀛楁
+ */
+ private String resolveDealMethod(InsOrder order) {
+ if (order == null) {
+ return StringUtils.EMPTY;
+ }
+ if (Integer.valueOf(1).equals(order.getSampleDisposal())) {
+ return "濮旀墭鍗曚綅鍙栧洖";
+ }
+ if (Integer.valueOf(2).equals(order.getSampleDisposal())) {
+ return "瀹為獙瀹ゅ鐞�";
+ }
+ return Integer.valueOf(1).equals(order.getProcessing()) ? "瀹為獙瀹ゅ鐞�" : "濮旀墭鍗曚綅鍙栧洖";
}
@Override
--
Gitblit v1.9.3