From cf6b965a86065a537a40c74f67e88a04447d2582 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期一, 12 七月 2021 18:00:38 +0800
Subject: [PATCH] 修改导入申购

---
 src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index 3be8272..b773749 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -1254,7 +1254,8 @@
                     logger.error("The containerCode has not been exists!");
                     continue;
                 }
-			} else if (status.equals(2)){
+			}
+			else if (status.equals(2)){
 				/*SysWarehouseContainer container = sysWarehouseContainerDao
 						.getSysWarehouseContainerByContainerCode(containerCode);
 				if (Objects.isNull(container) == false) {
@@ -1278,8 +1279,10 @@
 			if (status.equals(-1)){
                 continue;
             }
- 			opeReagentStatusDao.syncOpeReagentStatus(params);
-
+ 			int i = opeReagentStatusDao.syncOpeReagentStatus(params);
+            if (i < 1){
+                opeReagentStatusDao.syncOpeReagentStatus(params);
+            }
     	 }
     }
 
@@ -1534,15 +1537,16 @@
 
             }
                 sysAlarmPersonDao.insertSysAlarmPerson(sysAlarmPerson);
+                // 将人员扣分更新到人员表
+                if (warningPoint == null) {
+                    warningPoint = 0;
+                }
+                 //	SysUser user = sysUserDao.getSysUser(userId);
+                if (user != null) {
+                    sysUserDao.updateUserPointBySelective(user.getPoint() - warningPoint, user.getId());
+                }
 			}
-            // 将人员扣分更新到人员表
-			if (warningPoint == null) {
-				warningPoint = 0;
-			}
-//			SysUser user = sysUserDao.getSysUser(userId);
-			if (user != null) {
-				sysUserDao.updateUserPointBySelective(user.getPoint() - warningPoint, user.getId());
-			}
+
 
 		}
     }

--
Gitblit v1.9.2