From e5ebd02de9615e2a22694dba7e4207526054b2f8 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 11 七月 2023 23:21:44 +0800
Subject: [PATCH] 123456
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index cdb1eec..928222c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -10,8 +10,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfClean;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfClean;
import com.ruoyi.mapper.ZfCleanMapper;
@@ -25,6 +24,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -60,6 +61,19 @@
.like(StringUtils.isNotEmpty(zfClean.getRemark()), ZfClean::getRemark, zfClean.getRemark())
.eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime())
.between(zfClean.getHappenStartTime() != null && zfClean.getHappenEndTime() != null, ZfClean::getHappenTime, zfClean.getHappenStartTime(), zfClean.getHappenEndTime());
+ return lqw;
+ }
+
+ private LambdaQueryWrapper<ZfClean> uniqueCondition(ZfClean zfClean) {
+ LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(zfClean.getKind() != null, ZfClean::getKind, zfClean.getKind())
+ .eq(StringUtils.isNotEmpty(zfClean.getSuitable()), ZfClean::getSuitable, zfClean.getSuitable())
+ .eq(StringUtils.isNotEmpty(zfClean.getType()), ZfClean::getType, zfClean.getType())
+ .eq(StringUtils.isNotEmpty(zfClean.getMethod()), ZfClean::getMethod, zfClean.getMethod())
+ .eq(StringUtils.isNotEmpty(zfClean.getPlace()), ZfClean::getPlace, zfClean.getPlace())
+ .eq(StringUtils.isNotEmpty(zfClean.getLocation()), ZfClean::getLocation, zfClean.getLocation())
+ .eq(StringUtils.isNotEmpty(zfClean.getRemark()), ZfClean::getRemark, zfClean.getRemark())
+ .eq(zfClean.getHappenTime() != null, ZfClean::getHappenTime, zfClean.getHappenTime());
return lqw;
}
@@ -194,6 +208,16 @@
return markOwnData(familyIds, beanRecords);
}
+ @Override
+ public List<ZfClean> selectByIds(Long[] ids) {
+ List<ZfClean> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private static List<ZfClean> markOwnData(String familyIds, List<ZfClean> beanRecords) {
return beanRecords.stream().peek(record -> {
String recordFamilyId = record.getFamilyId();
@@ -279,6 +303,13 @@
zfClean.setFamilyId(myFamilyId);
}
+ //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+ LambdaQueryWrapper<ZfClean> lqw = uniqueCondition(zfClean);
+ List<ZfClean> list = list(lqw);
+ if(list.size()>0){
+ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+ }
+
if (save(zfClean)) {
return AjaxResult.success();
} else {
@@ -287,6 +318,8 @@
}
+
+
@Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
--
Gitblit v1.9.1