From db3253cb595be3682157a632a77078cc513603c3 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 24 Mar 2021 16:06:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java b/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
index d274fc5..e61e47b 100644
--- a/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/DangerousEncodeController.java
@@ -4,6 +4,7 @@
import com.nanometer.smartlab.service.DangerousEncodeService;
import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.IDUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.primefaces.context.RequestContext;
import org.primefaces.event.FileUploadEvent;
@@ -68,7 +69,7 @@
DangerousEncode su = null;
while (iterator.hasNext()) {
su = iterator.next();
- if (rowKey.equals(su.getId())) {
+ if (Long.parseLong(rowKey) == (su.getId())) {
return su;
}
}
@@ -85,25 +86,83 @@
//保存
public void onSaveBtnClick(){
try {
-
+ String retmsg = "";
//插入
if (dangerousEncode.getId() == null) {
//设置 id,创建者和更新时间
- dangerousEncode.setId(IDUtils.uuid());
dangerousEncode.setCreator(getUser().getId());
dangerousEncode.setUpdateTime(new Date());
+
+ if (StringUtils.isBlank(dangerousEncode.getReagentCode())){
+ retmsg +=("试剂名称码不能为空");
+ }else {
+ List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(dangerousEncode.getReagentCode(),null,null,null);
+ if (list1.size() > 0){
+ retmsg +=("试剂名称码已存在,请更换");
+ }
+ }
+
+ if (StringUtils.isBlank(dangerousEncode.getReagentName())){
+ retmsg +=("试剂名称不能为空");
+ }else {
+ List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(null,dangerousEncode.getReagentName(),null,null);
+ if (list1.size() > 0){
+ retmsg +=("试剂名称已存在,请更换");
+ }
+ }
+
+ if (StringUtils.isBlank(dangerousEncode.getCode())){
+ retmsg +=("编码不能为空");
+ }else {
+ List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(null,null,null,dangerousEncode.getCode());
+ if (list1.size() > 0){
+ retmsg +=("编码已存在,请更换");
+ }
+ }
//插入
- dangerousEncodeService.insertOne(dangerousEncode);
+ if (StringUtils.isBlank(retmsg)) {
+ dangerousEncodeService.insertOne(dangerousEncode);
+ }
}
//更新
else{
- dangerousEncode.setUpdateTime(new Date());
- dangerousEncodeService.updateOne(dangerousEncode);
+ if (StringUtils.isBlank(dangerousEncode.getReagentCode())){
+ retmsg +=("试剂名称码不能为空");
+ }else {
+ List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(dangerousEncode.getReagentCode(),null,null,null);
+ if (list1.size() > 0 && !list1.get(0).getId().equals(dangerousEncode.getId())){
+ retmsg +=("试剂名称码已存在,请更换");
+ }
+ }
+
+ if (StringUtils.isBlank(dangerousEncode.getReagentName())){
+ retmsg +=("试剂名称不能为空");
+ }else {
+ List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(null,dangerousEncode.getReagentName(),null,null);
+ if (list1.size() > 0 && !list1.get(0).getId().equals(dangerousEncode.getId())){
+ retmsg +=("试剂名称已存在,请更换");
+ }
+ }
+
+ if (StringUtils.isBlank(dangerousEncode.getCode())){
+ retmsg +=("编码不能为空");
+ }else {
+ List<DangerousEncode> list1 = dangerousEncodeService.selectByCodeAndName(null,null,null,dangerousEncode.getCode());
+ if (list1.size() > 0 && !list1.get(0).getId().equals(dangerousEncode.getId())){
+ retmsg += "编码已存在,请更换";
+ }
+ }
+ if (StringUtils.isBlank(retmsg)) {
+ dangerousEncode.setUpdateTime(new Date());
+ dangerousEncodeService.updateOne(dangerousEncode);
+ }
}
-
- FacesUtils.info("操作成功");
- RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
-
+ if (StringUtils.isNotBlank(retmsg)){
+ FacesUtils.error(retmsg);
+ }else {
+ RequestContext.getCurrentInstance().execute("PF('dialog').hide()");
+ FacesUtils.info("操作成功");
+ }
}catch (Exception e){
e.printStackTrace();
FacesUtils.warn("操作失败");
--
Gitblit v1.9.2