From cd48455bd44a1935a81f8e78c727b858fae271db Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 07 四月 2025 11:41:57 +0800
Subject: [PATCH] 招标新增审核状态 待审核

---
 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java |   34 +++++++++-------------------------
 1 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java
index bba1fa4..f9bcaa3 100644
--- a/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java
+++ b/platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/ReceivingNoteServiceImpl.java
@@ -69,19 +69,12 @@
 			for (ReceivingNoteItem item:entity.getNoteItemList()
 			) {
 				if (contractItem.getDeviceId().equals(item.getDeviceId())){
-					if (contractItem.getNum()>=item.getNum()) {
+					if (contractItem.getNum() < item.getNum()) {
 						return R.failed("楠屾敹鏄庣粏涓�"+item.getDeviceName()+"璁惧鏁伴噺涓嶈兘瓒呰繃鍚堝悓鏄庣粏涓璁㈢殑璁惧鏁伴噺");
 					}
-					//鏌ヨ鏄惁鏈夊巻鍙查獙鏀�
-					QueryWrapper<ReceivingNoteItem> queryWrapperNoteItem = new QueryWrapper<>();
-					queryWrapperNoteItem.eq("contract_id",contract.getId());
-					queryWrapperNoteItem.eq("device_id",contractItem.getDeviceId());
-					List<ReceivingNoteItem> noteItemList = itemMapper.selectList(queryWrapperNoteItem);
-					if (noteItemList != null&&noteItemList.size()>0) {
-						Integer deviceNum = noteItemList.stream().mapToInt(ReceivingNoteItem::getNum).sum();
-						if (contractItem.getNum()>=(item.getNum()+deviceNum)) {
-							return R.failed("鍚堝悓涓�"+item.getDeviceName()+"璁惧鏁伴噺涓庡疄闄呴獙鏀舵槑缁嗕腑涓嶄竴鑷�");
-						}
+					Integer deviceNum = itemMapper.selectDeviceNumByContractId(contractItem.getContractId(),item.getDeviceId());
+					if (contractItem.getNum()<(deviceNum+item.getNum())){
+						return R.failed("瀹為檯楠屾敹鏄庣粏涓�"+item.getDeviceName()+"璁惧鏁伴噺涓嶈兘瓒呰繃鍚堝悓鏄庣粏涓璁㈢殑璁惧鏁伴噺");
 					}
 				}
 				//璁惧搴忓垪鍙锋鏌ユ槸鍚︽湁鐩稿悓鐨勫瓨鍦�
@@ -156,17 +149,8 @@
 		//鍚堝悓鏄庣粏涓笌瀹為檯楠屾敹瀵规瘮
 		for (ContractItem contractItem:list
 		) {
-			//鏌ヨ瀹為檯楠屾敹鎯呭喌
-			QueryWrapper<ReceivingNoteItem> queryWrapperNoteItem = new QueryWrapper<>();
-			queryWrapperNoteItem.eq("contract_id",contract.getId());
-			queryWrapperNoteItem.eq("device_id",contractItem.getDeviceId());
-			List<ReceivingNoteItem> noteItemList = itemMapper.selectList(queryWrapperNoteItem);
-			if (noteItemList != null&&noteItemList.size()>0) {
-				Integer deviceNum = noteItemList.stream().mapToInt(ReceivingNoteItem::getNum).sum();
-				if (contractItem.getNum()!=deviceNum) {
-					return R.ok();
-				}
-			}else {
+			Integer deviceNum = itemMapper.selectDeviceNumByContractId(contractItem.getContractId(),contractItem.getDeviceId());
+			if (contractItem.getNum()!=deviceNum){
 				return R.ok();
 			}
 		}
@@ -204,8 +188,8 @@
 	}
 
 	public static void main(String[] args) {
-		Long l1= 1905442028714270722l;
-		long l2 = 1905442028714270722l;
-		System.out.println(l1==l2);
+		int l1= 2;
+		int l2 = 3;
+		System.out.println(l1>=l2);
 	}
 }

--
Gitblit v1.9.1