From 04ada048df59ec42360c9837b7c11d4c4f903d21 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 14:14:16 +0800
Subject: [PATCH] 实有人口新增模板导入
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
index e2b3319..3720095 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSwRotaServiceImpl.java
@@ -179,7 +179,7 @@
return R.fail("该值班表不存在");
}
ComSwRotaDO checkCreditCode = comSwRotaDAO.selectOne(new QueryWrapper<ComSwRotaDO>().lambda().eq(ComSwRotaDO::getRotaDate, comSwRotaSaveDTO.getRotaDate()));
- if (null != checkCreditCode && comSwRotaDO.getId() != checkCreditCode.getId()) {
+ if (null != checkCreditCode && !comSwRotaDO.getId().equals(checkCreditCode.getId())) {
return R.fail("该值班表已存在，值班日期重复");
}
BeanUtils.copyProperties(comSwRotaSaveDTO, comSwRotaDO);
@@ -225,9 +225,9 @@
}catch (ParseException e) {
e.printStackTrace();
}
- if (comSwRotaDO == null) {
- return R.fail(rotaDate + "值班表不存在");
- }
+// if (comSwRotaDO == null) {
+// return R.fail(rotaDate + "值班表不存在");
+// }
List<ComSwRotaPersonVO> rotaPersons = new ArrayList<>();
if (null != comSwRotaDO){
String rotaPerson = comSwRotaDO.getRotaPerson();
@@ -255,9 +255,9 @@
} catch (ParseException e) {
e.printStackTrace();
}
- if (comSwRotaDO == null) {
- return R.fail(rotaDate + "值班表不存在");
- }
+// if (comSwRotaDO == null) {
+// return R.fail(rotaDate + "值班表不存在");
+// }
List<ComSwRotaPersonVO> rotaLeaders = new ArrayList<>();
if (null != comSwRotaDO){
String rotaPerson = comSwRotaDO.getRotaLeader();
--
Gitblit v1.7.1