From e5cb65e56ca20f10aa581edfd26e13a114b590f4 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 15:16:44 +0800
Subject: [PATCH] 合并了一个方法

---
 zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java |   48 ++++++++++++++++++++++++++++++++++--------------
 1 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index d1c5af7..6fd2c53 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -11,6 +11,7 @@
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfEvent;
 import com.ruoyi.domain.ZfProperty;
 import com.ruoyi.mapper.ZfPropertyMapper;
 import com.ruoyi.service.IZfPropertyService;
@@ -22,6 +23,9 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -38,14 +42,11 @@
 @Service
 public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
 
-
-
     @Resource
     IZfPropertyService zfPropertyService;
 
     @Resource
     ZInfoUserService zInfoUserService;
-
 
 
     private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
@@ -57,7 +58,8 @@
                 .like(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
                 .like(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
                 .like(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
-                .like(zfProperty.getCreateTime() != null, ZfProperty::getCreateTime, zfProperty.getCreateTime());
+                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
+                .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
         return lqw;
     }
 
@@ -86,7 +88,7 @@
                     secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
                 }
 
-            }else{
+            } else {
                 setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority);
                 //鎶婂悗闈㈢殑閫楀彿鍘绘帀
                 if (secondFamilyIdsBuffer.length() > 1) {
@@ -140,7 +142,7 @@
 
         }
 
-        lqw.orderByDesc(ZfProperty::getId);
+        lqw.orderByDesc(ZfProperty::getCreateTime);
         return lqw;
     }
 
@@ -183,7 +185,7 @@
     }
 
     @Override
-        public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
+    public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
         String familyIds = listFamilyIds();
         String secondFamilyIds = listSecondFamilyIds();
         LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds, secondFamilyIds);
@@ -247,7 +249,7 @@
         if (flag) {
             if (save(zfProperty)) {
                 return AjaxResult.success();
-            }else {
+            } else {
                 return AjaxResult.error();
             }
 
@@ -257,34 +259,52 @@
     }
 
     @Override
-    public AjaxResult addData2(ZfProperty zfProperty){
+    public AjaxResult addData2(ZfProperty zfProperty) {
         ZInfoUser mySelf = getMySelf();
         String myFamilyId = mySelf.getFamilyId();
 
-        if (StringUtils.isNotEmpty(zfProperty.getFamilyId())){
+        if (StringUtils.isNotEmpty(zfProperty.getFamilyId())) {
             throw new RuntimeException("瀵煎叆鏁版嵁鏃舵偍涓嶈兘鎸囧畾瀹跺涵鍙�");
         }
 
-        if(StringUtils.isEmpty(myFamilyId)){
+        if (StringUtils.isEmpty(myFamilyId)) {
             throw new RuntimeException("鎮ㄨ繕鏈姞鍏ヤ换浣曞搴�");
         }
 
-        if (myFamilyId.contains(",")){
+        if (myFamilyId.contains(",")) {
             String[] myFamilyIds = myFamilyId.split(",");
             //榛樿娣诲姞绗竴涓搴殑鏁版嵁
             zfProperty.setFamilyId(myFamilyIds[0]);
-        }else {
+        } else {
             zfProperty.setFamilyId(myFamilyId);
+        }
+
+        //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+        LambdaQueryWrapper<ZfProperty> lqw = uniqueCondition(zfProperty);
+        List<ZfProperty> list = list(lqw);
+        if(list.size()>0){
+            throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
         }
 
         if (save(zfProperty)) {
             return AjaxResult.success();
-        }else {
+        } else {
             return AjaxResult.error();
         }
     }
 
+    private LambdaQueryWrapper<ZfProperty> uniqueCondition(ZfProperty zfProperty) {
+        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(!StringUtils.isEmpty(zfProperty.getType()), ZfProperty::getType, zfProperty.getType())
+                .eq(!StringUtils.isEmpty(zfProperty.getTitle()), ZfProperty::getTitle, zfProperty.getTitle())
+                .eq(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
+                .eq(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
+                .eq(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
+                .eq(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
+                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime());
+        return lqw;
 
+    }
 
     @Override
     @Transactional

--
Gitblit v1.9.1